rework architecture / embedded systems concept

Make configuration of new targets cheap.
Just add a new file in target/arch/sys-enabled/foo.
See other files for syntax. While doing runtime tests
with the new infrastructure I've updated a lot of other
stuff:
- gcc 4.5.2
- uClibc 0.9.32-rc1 (NPTL)
- strongswan, php, miredo, parted, util-linux-ng, e2fsprogs

I promise, this is the last big fat commit this year ;)

1 files changed, 24 insertions, 34 deletions

diff --git a/package/aufs2-util/src/Makefile b/package/aufs2-util/src/Makefile
index 35c5f6645..544dfc538 100644
--- a/package/aufs2-util/src/Makefile
+++ b/package/aufs2-util/src/Makefile
@@ -1,5 +1,5 @@
 
-# Copyright (C) 2005-2009 Junjiro Okajima
+# Copyright (C) 2005-2010 Junjiro R. Okajima
 #
 # This program, aufs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,11 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301	 USA
 
-ifndef KDIR
-KDIR = /lib/modules/$(shell uname -r)/build
-endif
-
-CFLAGS += -I${KDIR}/include
+CFLAGS += -I./libau
 CFLAGS += -O -Wall
 
 Cmd = umount.aufs auchk aubrsync
@@ -27,32 +23,23 @@ Man = aufs.5
 Etc = etc_default_aufs
 Bin = auplink mount.aufs #auctl
 BinObj = $(addsuffix .o, ${Bin})
-LibSo = libau.so
-LibSoObj = rdu.o
-LibSoHdr = compat.h
 LibUtil = libautil.a
 LibUtilObj = proc_mnt.o br.o plink.o mtab.o
 LibUtilHdr = au_util.h
+export
 
-all: ${Bin} ${Etc} #${LibSo}
+all: ${Man} ${Bin} ${Etc}
+	${MAKE} -C libau $@
+	ln -sf ./libau/libau*.so .
 
 ${Bin}: LDFLAGS += -static -s
 ${Bin}: LDLIBS = -L. -lautil
 ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil}
 
 ${LibUtilObj}: %.o: %.c ${LibUtilHdr}
-${LibUtil}: ${LibUtil}(${LibUtilObj})
-
-${LibSoObj}: CFLAGS += -fPIC
-${LibSoObj}: %.o: %.c ${LibSolHdr}
-
-# in order to reuse the default rule
-Dummy = $(basename $(word 1,${LibSoObj}))
-${Dummy}: LDFLAGS += --shared
-${Dummy}: LDLIBS += -ldl -lpthread
-${Dummy}: ${LibSoObj}
-${LibSo}: ${Dummy}
-	ln -f $< $@
+#${LibUtil}: ${LibUtil}(${LibUtilObj})
+${LibUtil}: $(foreach o, ${LibUtilObj}, ${LibUtil}(${o}))
+.NOTPARALLEL: ${LibUtil}
 
 etc_default_aufs: c2sh aufs.shlib
 	${RM} $@
@@ -75,29 +62,32 @@ aufs.5: aufs.in.5 c2tmac
 
 .INTERMEDIATE: c2sh c2tmac
 
+Install = install -o root -g root -p
 install_sbin: File = mount.aufs umount.aufs auplink
 install_sbin: Tgt = ${DESTDIR}/sbin
 install_ubin: File = auchk aubrsync #auctl
 install_ubin: Tgt = ${DESTDIR}/usr/bin
-install_man: File = aufs.5
-install_man: Tgt = ${DESTDIR}/usr/share/man/man5
-install_ulib: Opt = -s
-install_ulib: File = ${LibSo}
-install_ulib: Tgt = ${DESTDIR}/ulib
-install_sbin install_ubin install_man install_ulib: ${File}
+install_sbin install_ubin: ${File}
 	install -d ${Tgt}
-	install -m 755 -o root -g root -p ${Opt} ${File} ${Tgt}
+	${Install} -m 755 ${File} ${Tgt}
 install_etc: File = etc_default_aufs
 install_etc: Tgt = ${DESTDIR}/etc/default/aufs
 install_etc: ${File}
 	install -d $(dir ${Tgt})
-	install -m 644 -o root -g root -p -T ${File} ${Tgt}
+	${Install} -m 644 -T ${File} ${Tgt}
+install_man: File = aufs.5
+install_man: Tgt = ${DESTDIR}/usr/share/man/man5
+install_man: ${File}
+	install -d ${Tgt}
+	${Install} -m 644 ${File} ${Tgt}
+install_ulib:
+	${MAKE} -C libau $@
 
-# do not inlcude install_ulib here
-install: install_sbin install_ubin install_etc
+install: install_man install_sbin install_ubin install_etc install_ulib
 
 clean:
-	${RM} ${Man} ${Bin} ${Etc} ${LibUtil} ${LibSo} *~
-	${RM} ${BinObj} ${LibUtilObj} ${LibSoObj} ${Dummy}
+	${RM} ${Man} ${Bin} ${Etc} ${LibUtil} libau.so* *~
+	${RM} ${BinObj} ${LibUtilObj}
+	${MAKE} -C libau $@
 
 -include priv.mk