Home Explore Help
Register Sign In
oss
/
openadk
4
1
Fork 3
Files Issues 0 Pull Requests 0 Wiki
Tree: 33aa9014cb
Branches Tags
openadk
/
package
/
chillispot
/
patches
/
patch-src_Makefile

patch-src_Makefile 8.2 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243 
  1. $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
    2. 

  2. --- chillispot-1.1.0.orig/src/Makefile	2006-09-24 21:35:16.000000000 +0200
    3. 

  3. +++ chillispot-1.1.0/src/Makefile	2009-05-21 20:42:08.000000000 +0200
    4. 

  4. @@ -16,9 +16,9 @@
    5. 

  5.  
    6. 

  6.  SOURCES = $(chilli_SOURCES)
    7. 

  7.  
    8. 

  8. -srcdir = .
    9. 

  9. -top_srcdir = ..
    10. 

  10. -
    11. 

  11. +srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src
    12. 

  12. +top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
    13. 

  13. +VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src
    14. 

  14.  pkgdatadir = $(datadir)/chillispot
    15. 

  15.  pkglibdir = $(libdir)/chillispot
    16. 

  16.  pkgincludedir = $(includedir)/chillispot
    17. 

  17. @@ -36,8 +36,8 @@ POST_INSTALL = :
    18. 

  18.  NORMAL_UNINSTALL = :
    19. 

  19.  PRE_UNINSTALL = :
    20. 

  20.  POST_UNINSTALL = :
    21. 

  21. -build_triplet = i686-pc-linux-gnu
    22. 

  22. -host_triplet = i686-pc-linux-gnu
    23. 

  23. +build_triplet = x86_64-pc-linux-gnu
    24. 

  24. +host_triplet = i586-pc-linux-gnu
    25. 

  25.  sbin_PROGRAMS = chilli$(EXEEXT)
    26. 

  26.  subdir = src
    27. 

  27.  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    28. 

  28. @@ -73,24 +73,24 @@ DIST_SOURCES = $(chilli_SOURCES)
    29. 

  29.  ETAGS = etags
    30. 

  30.  CTAGS = ctags
    31. 

  31.  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    32. 

  32. -ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9
    33. 

  33. -AMDEP_FALSE = #
    34. 

  34. -AMDEP_TRUE = 
    35. 

  35. -AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar
    36. 

  36. -AR = ar
    37. 

  37. -AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf
    38. 

  38. -AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader
    39. 

  39. -AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9
    40. 

  40. +ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9
    41. 

  41. +AMDEP_FALSE = 
    42. 

  42. +AMDEP_TRUE = #
    43. 

  43. +AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar
    44. 

  44. +AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
    45. 

  45. +AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf
    46. 

  46. +AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader
    47. 

  47. +AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9
    48. 

  48.  AWK = gawk
    49. 

  49. -CC = gcc
    50. 

  50. -CCDEPMODE = depmode=gcc3
    51. 

  51. -CFLAGS = -g -O2
    52. 

  52. -CPP = gcc -E
    53. 

  53. -CPPFLAGS = 
    54. 

  54. -CXX = g++
    55. 

  55. -CXXCPP = g++ -E
    56. 

  56. -CXXDEPMODE = depmode=gcc3
    57. 

  57. -CXXFLAGS = -g -O2
    58. 

  58. +CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
    59. 

  59. +CCDEPMODE = depmode=none
    60. 

  60. +CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
    61. 

  61. +CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
    62. 

  62. +CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
    63. 

  63. +CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++
    64. 

  64. +CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E
    65. 

  65. +CXXDEPMODE = depmode=none
    66. 

  66. +CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
    67. 

  67.  CYGPATH_W = echo
    68. 

  68.  DEFS = -DHAVE_CONFIG_H
    69. 

  69.  DEPDIR = .deps
    70. 

  70. @@ -100,19 +100,19 @@ ECHO_N = -n
    71. 

  71.  ECHO_T = 
    72. 

  72.  EGREP = grep -E
    73. 

  73.  EXEEXT = 
    74. 

  74. -F77 = f95
    75. 

  75. -FFLAGS = -g -O2
    76. 

  76. +F77 = 
    77. 

  77. +FFLAGS = 
    78. 

  78.  INSTALL_DATA = ${INSTALL} -m 644
    79. 

  79.  INSTALL_PROGRAM = ${INSTALL}
    80. 

  80.  INSTALL_SCRIPT = ${INSTALL}
    81. 

  81.  INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
    82. 

  82. -LDFLAGS = 
    83. 

  83. -LIBOBJS = 
    84. 

  84. +LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
    85. 

  85. +LIBOBJS =  memcmp$U.o
    86. 

  86.  LIBS = 
    87. 

  87.  LIBTOOL = $(SHELL) $(top_builddir)/libtool
    88. 

  88.  LN_S = ln -s
    89. 

  89. -LTLIBOBJS = 
    90. 

  90. -MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo
    91. 

  91. +LTLIBOBJS =  memcmp$U.lo
    92. 

  92. +MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo
    93. 

  93.  OBJEXT = o
    94. 

  94.  PACKAGE = chillispot
    95. 

  95.  PACKAGE_BUGREPORT = bugs@chillispot.org
    96. 

  96. @@ -121,54 +121,54 @@ PACKAGE_STRING = chillispot 1.1.0
    97. 

  97.  PACKAGE_TARNAME = chillispot
    98. 

  98.  PACKAGE_VERSION = 1.1.0
    99. 

  99.  PATH_SEPARATOR = :
    100. 

  100. -RANLIB = ranlib
    101. 

  101. +RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
    102. 

  102.  SET_MAKE = 
    103. 

  103. -SHELL = /bin/sh
    104. 

  104. -STRIP = strip
    105. 

  105. +SHELL = /bin/bash
    106. 

  106. +STRIP = i586-linux-strip
    107. 

  107.  VERSION = 1.1.0
    108. 

  108. -ac_ct_AR = ar
    109. 

  109. -ac_ct_CC = gcc
    110. 

  110. -ac_ct_CXX = g++
    111. 

  111. -ac_ct_F77 = f95
    112. 

  112. -ac_ct_RANLIB = ranlib
    113. 

  113. -ac_ct_STRIP = strip
    114. 

  114. -am__fastdepCC_FALSE = #
    115. 

  115. -am__fastdepCC_TRUE = 
    116. 

  116. -am__fastdepCXX_FALSE = #
    117. 

  117. -am__fastdepCXX_TRUE = 
    118. 

  118. +ac_ct_AR = 
    119. 

  119. +ac_ct_CC = 
    120. 

  120. +ac_ct_CXX = 
    121. 

  121. +ac_ct_F77 = 
    122. 

  122. +ac_ct_RANLIB = 
    123. 

  123. +ac_ct_STRIP = 
    124. 

  124. +am__fastdepCC_FALSE = 
    125. 

  125. +am__fastdepCC_TRUE = #
    126. 

  126. +am__fastdepCXX_FALSE = 
    127. 

  127. +am__fastdepCXX_TRUE = #
    128. 

  128.  am__include = include
    129. 

  129.  am__leading_dot = .
    130. 

  130.  am__quote = 
    131. 

  131.  am__tar = ${AMTAR} chof - "$$tardir"
    132. 

  132.  am__untar = ${AMTAR} xf -
    133. 

  133.  bindir = ${exec_prefix}/bin
    134. 

  134. -build = i686-pc-linux-gnu
    135. 

  135. -build_alias = 
    136. 

  136. -build_cpu = i686
    137. 

  137. +build = x86_64-pc-linux-gnu
    138. 

  138. +build_alias = x86_64-linux-gnu
    139. 

  139. +build_cpu = x86_64
    140. 

  140.  build_os = linux-gnu
    141. 

  141.  build_vendor = pc
    142. 

  142. -datadir = ${prefix}/share
    143. 

  143. +datadir = /usr/share
    144. 

  144.  exec_prefix = ${prefix}
    145. 

  145. -host = i686-pc-linux-gnu
    146. 

  146. -host_alias = 
    147. 

  147. -host_cpu = i686
    148. 

  148. +host = i586-pc-linux-gnu
    149. 

  149. +host_alias = i586-linux
    150. 

  150. +host_cpu = i586
    151. 

  151.  host_os = linux-gnu
    152. 

  152.  host_vendor = pc
    153. 

  153.  includedir = ${prefix}/include
    154. 

  154.  infodir = ${prefix}/info
    155. 

  155. -install_sh = /home/jj/chillispot/install-sh
    156. 

  156. +install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh
    157. 

  157.  libdir = ${exec_prefix}/lib
    158. 

  158. -libexecdir = ${exec_prefix}/libexec
    159. 

  159. -localstatedir = ${prefix}/var
    160. 

  160. -mandir = ${prefix}/man
    161. 

  161. +libexecdir = /usr/sbin
    162. 

  162. +localstatedir = /var
    163. 

  163. +mandir = /usr/share/man
    164. 

  164.  mkdir_p = mkdir -p --
    165. 

  165.  oldincludedir = /usr/include
    166. 

  166. -prefix = /usr/local
    167. 

  167. -program_transform_name = s,x,x,
    168. 

  168. +prefix = /usr
    169. 

  169. +program_transform_name = s,$$,,;s,^,,
    170. 

  170.  sbindir = ${exec_prefix}/sbin
    171. 

  171.  sharedstatedir = ${prefix}/com
    172. 

  172. -sysconfdir = ${prefix}/etc
    173. 

  173. -target_alias = 
    174. 

  174. +sysconfdir = /etc
    175. 

  175. +target_alias = i586-linux
    176. 

  176.  
    177. 

  177.  # add -pg to enable gprof
    178. 

  178.  AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -DSBINDIR='"$(sbindir)"' 
    179. 

  179. @@ -244,38 +244,38 @@ mostlyclean-compile:
    180. 

  180.  distclean-compile:
    181. 

  181.  	-rm -f *.tab.c
    182. 

  182.  
    183. 

  183. -include ./$(DEPDIR)/chilli.Po
    184. 

  184. -include ./$(DEPDIR)/cmdline.Po
    185. 

  185. -include ./$(DEPDIR)/dhcp.Po
    186. 

  186. -include ./$(DEPDIR)/iphash.Po
    187. 

  187. -include ./$(DEPDIR)/ippool.Po
    188. 

  188. -include ./$(DEPDIR)/lookup.Po
    189. 

  189. -include ./$(DEPDIR)/md5.Po
    190. 

  190. -include ./$(DEPDIR)/radius.Po
    191. 

  191. -include ./$(DEPDIR)/redir.Po
    192. 

  192. -include ./$(DEPDIR)/syserr.Po
    193. 

  193. -include ./$(DEPDIR)/tun.Po
    194. 

  194. +#include ./$(DEPDIR)/chilli.Po
    195. 

  195. +#include ./$(DEPDIR)/cmdline.Po
    196. 

  196. +#include ./$(DEPDIR)/dhcp.Po
    197. 

  197. +#include ./$(DEPDIR)/iphash.Po
    198. 

  198. +#include ./$(DEPDIR)/ippool.Po
    199. 

  199. +#include ./$(DEPDIR)/lookup.Po
    200. 

  200. +#include ./$(DEPDIR)/md5.Po
    201. 

  201. +#include ./$(DEPDIR)/radius.Po
    202. 

  202. +#include ./$(DEPDIR)/redir.Po
    203. 

  203. +#include ./$(DEPDIR)/syserr.Po
    204. 

  204. +#include ./$(DEPDIR)/tun.Po
    205. 

  205.  
    206. 

  206.  .c.o:
    207. 

  207. -	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    208. 

  208. -	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    209. 

  209. -#	source='$<' object='$@' libtool=no \
    210. 

  210. -#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
    211. 

  211. -#	$(COMPILE) -c $<
    212. 

  212. +#	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    213. 

  213. +#	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    214. 

  214. +#	source='$<' object='$@' libtool=no 
    215. 

  215. +#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) 
    216. 

  216. +	$(COMPILE) -c $<
    217. 

  217.  
    218. 

  218.  .c.obj:
    219. 

  219. -	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
    220. 

  220. -	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    221. 

  221. -#	source='$<' object='$@' libtool=no \
    222. 

  222. -#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
    223. 

  223. -#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
    224. 

  224. +#	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
    225. 

  225. +#	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    226. 

  226. +#	source='$<' object='$@' libtool=no 
    227. 

  227. +#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) 
    228. 

  228. +	$(COMPILE) -c `$(CYGPATH_W) '$<'`
    229. 

  229.  
    230. 

  230.  .c.lo:
    231. 

  231. -	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    232. 

  232. -	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    233. 

  233. -#	source='$<' object='$@' libtool=yes \
    234. 

  234. -#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
    235. 

  235. -#	$(LTCOMPILE) -c -o $@ $<
    236. 

  236. +#	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    237. 

  237. +#	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    238. 

  238. +#	source='$<' object='$@' libtool=yes 
    239. 

  239. +#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) 
    240. 

  240. +	$(LTCOMPILE) -c -o $@ $<
    241. 

  241.  
    242. 

  242.  mostlyclean-libtool:
    243. 

  243.  	-rm -f *.lo
    244.