r1939 - in trunk/lib/libwww

dslinux_gpf at dslinux.in-berlin.de dslinux_gpf at dslinux.in-berlin.de
Fri Sep 28 09:39:32 CEST 2007


Author: gpf
Date: 2007-09-28 09:39:27 +0200 (Fri, 28 Sep 2007)
New Revision: 1939

Log:
update Makefile's so they don't get altered by build, and add and svnignore to libwww-config since its updated with $ROOTDIR


Modified: trunk/lib/libwww/Makefile
===================================================================
--- trunk/lib/libwww/Makefile	2007-09-28 02:27:19 UTC (rev 1938)
+++ trunk/lib/libwww/Makefile	2007-09-28 07:39:27 UTC (rev 1939)
@@ -13,13 +13,12 @@
 
 .compiled: #.configured
 	$(MAKE) -C src
-	sed -i 's at THEROOTDIR@$(ROOTDIR)@' src/libwww-config
+	sed -i -r 's@^prefix=.*$$@prefix=$(ROOTDIR)@' src/libwww-config
 	chmod 755 src/libwww-config
 	touch $@
 
 clean:
 	-[ -f src/Makefile ] && $(MAKE) -C src clean
-	sed -i 's@$(ROOTDIR)@THEROOTDIR@' src/libwww-config
 	rm -f .configured .compiled
 
 romfs:

Added: trunk/lib/libwww/src/.svnignore

Modified: trunk/lib/libwww/src/Library/Makefile
===================================================================
--- trunk/lib/libwww/src/Library/Makefile	2007-09-28 02:27:19 UTC (rev 1938)
+++ trunk/lib/libwww/src/Library/Makefile	2007-09-28 07:39:27 UTC (rev 1939)
@@ -151,12 +151,12 @@
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Library/Makefile
+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+#	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps #Library/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+#	cd $(top_builddir) \
+#	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) #./config.status
 
 
 # This directory's subdirectories are mostly independent; you can cd

Modified: trunk/lib/libwww/src/Library/src/Makefile
===================================================================
--- trunk/lib/libwww/src/Library/src/Makefile	2007-09-28 02:27:19 UTC (rev 1938)
+++ trunk/lib/libwww/src/Library/src/Makefile	2007-09-28 07:39:27 UTC (rev 1939)
@@ -346,12 +346,12 @@
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .h .html .lo .o .s .txt
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Library/src/Makefile
+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+#	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps #Library/src/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+#	cd $(top_builddir) \
+#	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) #./config.status
 
 
 mostlyclean-libLTLIBRARIES:

Modified: trunk/lib/libwww/src/Library/src/SSL/Makefile
===================================================================
--- trunk/lib/libwww/src/Library/src/SSL/Makefile	2007-09-28 02:27:19 UTC (rev 1938)
+++ trunk/lib/libwww/src/Library/src/SSL/Makefile	2007-09-28 07:39:27 UTC (rev 1939)
@@ -198,12 +198,12 @@
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .h .html .lo .o .s .txt
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Library/src/SSL/Makefile
+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+#	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps #Library/src/SSL/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+#	cd $(top_builddir) \
+#	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) #./config.status
 
 
 mostlyclean-libLTLIBRARIES:

Modified: trunk/lib/libwww/src/Library/src/SSL/windows/Makefile
===================================================================
--- trunk/lib/libwww/src/Library/src/SSL/windows/Makefile	2007-09-28 02:27:19 UTC (rev 1938)
+++ trunk/lib/libwww/src/Library/src/SSL/windows/Makefile	2007-09-28 07:39:27 UTC (rev 1939)
@@ -162,12 +162,12 @@
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .def .files
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Library/src/SSL/windows/Makefile
+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+#	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps #Library/src/SSL/windows/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+#	cd $(top_builddir) \
+#	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) #./config.status
 
 tags: TAGS
 TAGS:

Modified: trunk/lib/libwww/src/Library/src/vms/Makefile
===================================================================
--- trunk/lib/libwww/src/Library/src/vms/Makefile	2007-09-28 02:27:19 UTC (rev 1938)
+++ trunk/lib/libwww/src/Library/src/vms/Makefile	2007-09-28 07:39:27 UTC (rev 1939)
@@ -149,12 +149,12 @@
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Library/src/vms/Makefile
+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+#	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps #Library/src/vms/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+#	cd $(top_builddir) \
+#	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) #./config.status
 
 tags: TAGS
 TAGS:

Modified: trunk/lib/libwww/src/Library/src/windows/Makefile
===================================================================
--- trunk/lib/libwww/src/Library/src/windows/Makefile	2007-09-28 02:27:19 UTC (rev 1938)
+++ trunk/lib/libwww/src/Library/src/windows/Makefile	2007-09-28 07:39:27 UTC (rev 1939)
@@ -165,12 +165,12 @@
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .def .files
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Library/src/windows/Makefile
+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+#	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps #Library/src/windows/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+#	cd $(top_builddir) \
+#	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) #./config.status
 
 tags: TAGS
 TAGS:

Modified: trunk/lib/libwww/src/Makefile
===================================================================
--- trunk/lib/libwww/src/Makefile	2007-09-28 02:27:19 UTC (rev 1938)
+++ trunk/lib/libwww/src/Makefile	2007-09-28 07:39:27 UTC (rev 1939)
@@ -182,39 +182,39 @@
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .html
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+#	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+#	cd $(top_builddir) \
+#	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4):  configure.in  acinclude.m4
-	cd $(srcdir) && $(ACLOCAL)
+#$(ACLOCAL_M4):  configure.in  acinclude.m4
+#	cd $(srcdir) && $(ACLOCAL)
 
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
+#config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+#	$(SHELL) ./config.status --recheck
+#$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) #$(CONFIGURE_DEPENDENCIES)
+#	cd $(srcdir) && $(AUTOCONF)
 
-wwwconf.h: stamp-h
-	@if test ! -f $@; then \
-		rm -f stamp-h; \
-		$(MAKE) stamp-h; \
-	else :; fi
-stamp-h: $(srcdir)/wwwconf.h.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=wwwconf.h \
-	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/wwwconf.h.in: $(srcdir)/stamp-h.in
-	@if test ! -f $@; then \
-		rm -f $(srcdir)/stamp-h.in; \
-		$(MAKE) $(srcdir)/stamp-h.in; \
-	else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
+#wwwconf.h: stamp-h
+#	@if test ! -f $@; then \
+#		rm -f stamp-h; \
+#		$(MAKE) stamp-h; \
+#	else :; fi
+#stamp-h: $(srcdir)/wwwconf.h.in $(top_builddir)/config.status
+#	cd $(top_builddir) \
+#	  && CONFIG_FILES= CONFIG_HEADERS=wwwconf.h \
+#	     $(SHELL) ./config.status
+#	@echo timestamp > stamp-h 2> /dev/null
+#$(srcdir)/wwwconf.h.in: $(srcdir)/stamp-h.in
+#	@if test ! -f $@; then \
+#		rm -f $(srcdir)/stamp-h.in; \
+#		$(MAKE) $(srcdir)/stamp-h.in; \
+#	else :; fi
+#$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+#	cd $(top_srcdir) && $(AUTOHEADER)
+#	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
 
 mostlyclean-hdr:
 

Modified: trunk/lib/libwww/src/modules/Makefile
===================================================================
--- trunk/lib/libwww/src/modules/Makefile	2007-09-28 02:27:19 UTC (rev 1938)
+++ trunk/lib/libwww/src/modules/Makefile	2007-09-28 07:39:27 UTC (rev 1939)
@@ -151,12 +151,12 @@
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps modules/Makefile
+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+#	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps #modules/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+#	cd $(top_builddir) \
+#	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) #./config.status
 
 
 # This directory's subdirectories are mostly independent; you can cd

Modified: trunk/lib/libwww/src/modules/expat/Makefile
===================================================================
--- trunk/lib/libwww/src/modules/expat/Makefile	2007-09-28 02:27:19 UTC (rev 1938)
+++ trunk/lib/libwww/src/modules/expat/Makefile	2007-09-28 07:39:27 UTC (rev 1939)
@@ -151,12 +151,12 @@
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps modules/expat/Makefile
+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+#	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps #modules/expat/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+#	cd $(top_builddir) \
+#	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) #./config.status
 
 
 # This directory's subdirectories are mostly independent; you can cd

Modified: trunk/lib/libwww/src/modules/expat/xmlparse/Makefile
===================================================================
--- trunk/lib/libwww/src/modules/expat/xmlparse/Makefile	2007-09-28 02:27:19 UTC (rev 1938)
+++ trunk/lib/libwww/src/modules/expat/xmlparse/Makefile	2007-09-28 07:39:27 UTC (rev 1939)
@@ -182,12 +182,12 @@
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps modules/expat/xmlparse/Makefile
+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+#	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps #modules/expat/xmlparse/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+#	cd $(top_builddir) \
+#	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) #./config.status
 
 
 mostlyclean-libLTLIBRARIES:

Modified: trunk/lib/libwww/src/modules/expat/xmltok/Makefile
===================================================================
--- trunk/lib/libwww/src/modules/expat/xmltok/Makefile	2007-09-28 02:27:19 UTC (rev 1938)
+++ trunk/lib/libwww/src/modules/expat/xmltok/Makefile	2007-09-28 07:39:27 UTC (rev 1939)
@@ -178,12 +178,12 @@
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps modules/expat/xmltok/Makefile
+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+#	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps #modules/expat/xmltok/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+#	cd $(top_builddir) \
+#	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) #./config.status
 
 
 mostlyclean-libLTLIBRARIES:

Modified: trunk/lib/libwww/src/modules/md5/Makefile
===================================================================
--- trunk/lib/libwww/src/modules/md5/Makefile	2007-09-28 02:27:19 UTC (rev 1938)
+++ trunk/lib/libwww/src/modules/md5/Makefile	2007-09-28 07:39:27 UTC (rev 1939)
@@ -173,12 +173,12 @@
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps modules/md5/Makefile
+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+#	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps #modules/md5/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+#	cd $(top_builddir) \
+#	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) #./config.status
 
 
 mostlyclean-libLTLIBRARIES:




More information about the dslinux-commit mailing list