Hi Mike,
Mike Frysinger wrote:
This patch tweaks ROOTDIR to be an absolute path rather than relative as
somethings cannot handle the pure relative "..". I also added a FORCE
line for osip2 (needed it in Blackfin repo). Tweaked a few `make` to
$(MAKE). Finally, added an "-include Makefile.local" so people can put
their local customizations into that file rather than changing Makefile.
With the refactored library configuration there is no longer any
"FORCE" options. Just the single library config. It is much cleaner
than before.
So I merged some of this.
Regards
Greg
Signed-off-by: Mike Frysinger <[EMAIL PROTECTED]>
---
Index: lib/Makefile
===================================================================
RCS file: /var/cvs/uClinux-dist/lib/Makefile,v
retrieving revision 1.1.1.12
diff -u -p -r1.1.1.12 Makefile
--- lib/Makefile 1 Feb 2007 13:11:35 -0000 1.1.1.12
+++ lib/Makefile 26 May 2007 21:48:54 -0000
@@ -11,7 +11,7 @@
#
ifndef ROOTDIR
-ROOTDIR=..
+ROOTDIR=$(PWD)/..
endif
UCLINUX_BUILD_LIB=1
@@ -89,6 +89,7 @@ dir_3_$(CONFIG_LIB_LIBPCRE_FORCE)+= pcre
dir_3_$(CONFIG_LIB_LIBLZMA) += liblzma
dir_3_$(CONFIG_LIB_LIBLZMA_FORCE)+= liblzma
dir_3_$(CONFIG_LIB_OSIP2) += osip2
+dir_3_$(CONFIG_LIB_OSIP2_FORCE) += osip2
dir_3_$(CONFIG_LIB_LIBEFENCE) += libefence
dir_3_$(CONFIG_LIB_LIBEFENCE_FORCE) += libefence
dir_3_$(CONFIG_LIB_TERMCAP) += termcap
@@ -104,6 +105,8 @@ dir_4_$(CONFIG_LIB_LIBPNG_FORCE) += libp
# And build libraries in the prop directory last
dir_5_y = $(ROOTDIR)/prop
+-include Makefile.local
+
DIRS_y = $(foreach n,1 2 3 4 5,$(sort $(dir_$(n)_y)))
DIRS_all = $(foreach n,1 2 3 4 5,$(sort $(dir_$(n)_y) $(dir_$(n)_n)
$(dir_$(n)_)))
@@ -154,7 +157,7 @@ romfs:
$(ROMFSINST) -e CONFIG_USER_FLATFSD_FLATFSD -s config/resolv.conf
/etc/resolv.conf
$(ROMFSINST) -e CONFIG_USER_FLATFSD_FLATFSD -e
CONFIG_USER_TINYLOGIN_SHADOWPASSWDS -s config/shadow /etc/shadow
for i in $(DIRS_y) ; do \
- [ ! -d $$i ] || make -C $$i romfs || exit $$? ; \
+ [ ! -d $$i ] || $(MAKE) -C $$i romfs || exit $$? ; \
done
##############################################################################
@@ -162,7 +165,7 @@ romfs:
clean: clean_links
-for i in $(DIRS_all); do \
if [ -f $$i/.sgbuilt_lib ]; then \
- make -C $$i clean ; \
+ $(MAKE) -C $$i clean ; \
rm -f $$i/.sgbuilt_lib; \
fi; \
done
_______________________________________________
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
--
------------------------------------------------------------------------
Greg Ungerer -- Chief Software Dude EMAIL: [EMAIL PROTECTED]
Secure Computing Corporation PHONE: +61 7 3435 2888
825 Stanley St, FAX: +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com
_______________________________________________
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
