patch-src_Makefile 8.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243
  1. $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  2. --- chillispot-1.1.0.orig/src/Makefile 2006-09-24 21:35:16.000000000 +0200
  3. +++ chillispot-1.1.0/src/Makefile 2009-05-21 20:42:08.000000000 +0200
  4. @@ -16,9 +16,9 @@
  5. SOURCES = $(chilli_SOURCES)
  6. -srcdir = .
  7. -top_srcdir = ..
  8. -
  9. +srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src
  10. +top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
  11. +VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src
  12. pkgdatadir = $(datadir)/chillispot
  13. pkglibdir = $(libdir)/chillispot
  14. pkgincludedir = $(includedir)/chillispot
  15. @@ -36,8 +36,8 @@ POST_INSTALL = :
  16. NORMAL_UNINSTALL = :
  17. PRE_UNINSTALL = :
  18. POST_UNINSTALL = :
  19. -build_triplet = i686-pc-linux-gnu
  20. -host_triplet = i686-pc-linux-gnu
  21. +build_triplet = x86_64-pc-linux-gnu
  22. +host_triplet = i586-pc-linux-gnu
  23. sbin_PROGRAMS = chilli$(EXEEXT)
  24. subdir = src
  25. DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  26. @@ -73,24 +73,24 @@ DIST_SOURCES = $(chilli_SOURCES)
  27. ETAGS = etags
  28. CTAGS = ctags
  29. DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  30. -ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9
  31. -AMDEP_FALSE = #
  32. -AMDEP_TRUE =
  33. -AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar
  34. -AR = ar
  35. -AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf
  36. -AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader
  37. -AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9
  38. +ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9
  39. +AMDEP_FALSE =
  40. +AMDEP_TRUE = #
  41. +AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar
  42. +AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
  43. +AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf
  44. +AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader
  45. +AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9
  46. AWK = gawk
  47. -CC = gcc
  48. -CCDEPMODE = depmode=gcc3
  49. -CFLAGS = -g -O2
  50. -CPP = gcc -E
  51. -CPPFLAGS =
  52. -CXX = g++
  53. -CXXCPP = g++ -E
  54. -CXXDEPMODE = depmode=gcc3
  55. -CXXFLAGS = -g -O2
  56. +CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
  57. +CCDEPMODE = depmode=none
  58. +CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
  59. +CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
  60. +CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
  61. +CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++
  62. +CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E
  63. +CXXDEPMODE = depmode=none
  64. +CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
  65. CYGPATH_W = echo
  66. DEFS = -DHAVE_CONFIG_H
  67. DEPDIR = .deps
  68. @@ -100,19 +100,19 @@ ECHO_N = -n
  69. ECHO_T =
  70. EGREP = grep -E
  71. EXEEXT =
  72. -F77 = f95
  73. -FFLAGS = -g -O2
  74. +F77 =
  75. +FFLAGS =
  76. INSTALL_DATA = ${INSTALL} -m 644
  77. INSTALL_PROGRAM = ${INSTALL}
  78. INSTALL_SCRIPT = ${INSTALL}
  79. INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
  80. -LDFLAGS =
  81. -LIBOBJS =
  82. +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
  83. +LIBOBJS = memcmp$U.o
  84. LIBS =
  85. LIBTOOL = $(SHELL) $(top_builddir)/libtool
  86. LN_S = ln -s
  87. -LTLIBOBJS =
  88. -MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo
  89. +LTLIBOBJS = memcmp$U.lo
  90. +MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo
  91. OBJEXT = o
  92. PACKAGE = chillispot
  93. PACKAGE_BUGREPORT = bugs@chillispot.org
  94. @@ -121,54 +121,54 @@ PACKAGE_STRING = chillispot 1.1.0
  95. PACKAGE_TARNAME = chillispot
  96. PACKAGE_VERSION = 1.1.0
  97. PATH_SEPARATOR = :
  98. -RANLIB = ranlib
  99. +RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
  100. SET_MAKE =
  101. -SHELL = /bin/sh
  102. -STRIP = strip
  103. +SHELL = /bin/bash
  104. +STRIP = i586-linux-strip
  105. VERSION = 1.1.0
  106. -ac_ct_AR = ar
  107. -ac_ct_CC = gcc
  108. -ac_ct_CXX = g++
  109. -ac_ct_F77 = f95
  110. -ac_ct_RANLIB = ranlib
  111. -ac_ct_STRIP = strip
  112. -am__fastdepCC_FALSE = #
  113. -am__fastdepCC_TRUE =
  114. -am__fastdepCXX_FALSE = #
  115. -am__fastdepCXX_TRUE =
  116. +ac_ct_AR =
  117. +ac_ct_CC =
  118. +ac_ct_CXX =
  119. +ac_ct_F77 =
  120. +ac_ct_RANLIB =
  121. +ac_ct_STRIP =
  122. +am__fastdepCC_FALSE =
  123. +am__fastdepCC_TRUE = #
  124. +am__fastdepCXX_FALSE =
  125. +am__fastdepCXX_TRUE = #
  126. am__include = include
  127. am__leading_dot = .
  128. am__quote =
  129. am__tar = ${AMTAR} chof - "$$tardir"
  130. am__untar = ${AMTAR} xf -
  131. bindir = ${exec_prefix}/bin
  132. -build = i686-pc-linux-gnu
  133. -build_alias =
  134. -build_cpu = i686
  135. +build = x86_64-pc-linux-gnu
  136. +build_alias = x86_64-linux-gnu
  137. +build_cpu = x86_64
  138. build_os = linux-gnu
  139. build_vendor = pc
  140. -datadir = ${prefix}/share
  141. +datadir = /usr/share
  142. exec_prefix = ${prefix}
  143. -host = i686-pc-linux-gnu
  144. -host_alias =
  145. -host_cpu = i686
  146. +host = i586-pc-linux-gnu
  147. +host_alias = i586-linux
  148. +host_cpu = i586
  149. host_os = linux-gnu
  150. host_vendor = pc
  151. includedir = ${prefix}/include
  152. infodir = ${prefix}/info
  153. -install_sh = /home/jj/chillispot/install-sh
  154. +install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh
  155. libdir = ${exec_prefix}/lib
  156. -libexecdir = ${exec_prefix}/libexec
  157. -localstatedir = ${prefix}/var
  158. -mandir = ${prefix}/man
  159. +libexecdir = /usr/sbin
  160. +localstatedir = /var
  161. +mandir = /usr/share/man
  162. mkdir_p = mkdir -p --
  163. oldincludedir = /usr/include
  164. -prefix = /usr/local
  165. -program_transform_name = s,x,x,
  166. +prefix = /usr
  167. +program_transform_name = s,$$,,;s,^,,
  168. sbindir = ${exec_prefix}/sbin
  169. sharedstatedir = ${prefix}/com
  170. -sysconfdir = ${prefix}/etc
  171. -target_alias =
  172. +sysconfdir = /etc
  173. +target_alias = i586-linux
  174. # add -pg to enable gprof
  175. AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -DSBINDIR='"$(sbindir)"'
  176. @@ -244,38 +244,38 @@ mostlyclean-compile:
  177. distclean-compile:
  178. -rm -f *.tab.c
  179. -include ./$(DEPDIR)/chilli.Po
  180. -include ./$(DEPDIR)/cmdline.Po
  181. -include ./$(DEPDIR)/dhcp.Po
  182. -include ./$(DEPDIR)/iphash.Po
  183. -include ./$(DEPDIR)/ippool.Po
  184. -include ./$(DEPDIR)/lookup.Po
  185. -include ./$(DEPDIR)/md5.Po
  186. -include ./$(DEPDIR)/radius.Po
  187. -include ./$(DEPDIR)/redir.Po
  188. -include ./$(DEPDIR)/syserr.Po
  189. -include ./$(DEPDIR)/tun.Po
  190. +#include ./$(DEPDIR)/chilli.Po
  191. +#include ./$(DEPDIR)/cmdline.Po
  192. +#include ./$(DEPDIR)/dhcp.Po
  193. +#include ./$(DEPDIR)/iphash.Po
  194. +#include ./$(DEPDIR)/ippool.Po
  195. +#include ./$(DEPDIR)/lookup.Po
  196. +#include ./$(DEPDIR)/md5.Po
  197. +#include ./$(DEPDIR)/radius.Po
  198. +#include ./$(DEPDIR)/redir.Po
  199. +#include ./$(DEPDIR)/syserr.Po
  200. +#include ./$(DEPDIR)/tun.Po
  201. .c.o:
  202. - if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
  203. - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
  204. -# source='$<' object='$@' libtool=no \
  205. -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
  206. -# $(COMPILE) -c $<
  207. +# if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
  208. +# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
  209. +# source='$<' object='$@' libtool=no
  210. +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
  211. + $(COMPILE) -c $<
  212. .c.obj:
  213. - if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
  214. - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
  215. -# source='$<' object='$@' libtool=no \
  216. -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
  217. -# $(COMPILE) -c `$(CYGPATH_W) '$<'`
  218. +# if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
  219. +# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
  220. +# source='$<' object='$@' libtool=no
  221. +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
  222. + $(COMPILE) -c `$(CYGPATH_W) '$<'`
  223. .c.lo:
  224. - if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
  225. - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
  226. -# source='$<' object='$@' libtool=yes \
  227. -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
  228. -# $(LTCOMPILE) -c -o $@ $<
  229. +# if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
  230. +# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
  231. +# source='$<' object='$@' libtool=yes
  232. +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
  233. + $(LTCOMPILE) -c -o $@ $<
  234. mostlyclean-libtool:
  235. -rm -f *.lo