X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=3f9fef49d5b3bcb54a2a870a3c410104c26e0a1c;hb=dbfc520c605dee3244dbbfd563e908901324689b;hp=4e0ca6b3cfa466817b4960411704fa315960cff7;hpb=d2ce1817117daa9523b1572523f1e7684bae779f;p=elogind.git

diff --git a/Makefile b/Makefile
index 4e0ca6b3c..3f9fef49d 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ DEBUG = true
 
 
 ROOT =		udev
-VERSION =	0.1
+VERSION =	0.2
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 
@@ -38,7 +38,9 @@ CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
 CC = $(CROSS)gcc
 AR = $(CROSS)ar
 STRIP = $(CROSS)strip
+RANLIB = $(CROSS)ranlib
 
+export CROSS CC AR STRIP RANLIB
 
 # code taken from uClibc to determine the current arch
 ARCH := ${shell $(CC) -dumpmachine | sed -e s'/-.*//' -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \
@@ -104,14 +106,29 @@ else
 	LDFLAGS = --static 
 endif
 
+LIB=libsysfs
+
 all: $(LIBC) $(ROOT)
 
 $(ARCH_LIB_OBJS) :
 	$(MAKE) -C klibc
 
+LIBSYSFS = libsysfs/libsysfs.a
+TDB = tdb/tdb.o tdb/spinlock.o
+
 OBJS =	udev.o		\
-	logging.o
+	udev-add.o	\
+	udev-remove.o	\
+	udevdb.o	\
+	logging.o	\
+	namedev.o	\
+	$(TDB)
+
+libsysfs/libsysfs.a:
+	$(MAKE) -C libsysfs
 
+tdb/tdb.o:
+	$(MAKE) -C tdb
 
 # header files automatically generated
 GEN_HEADERS =	udev_version.h
@@ -121,8 +138,9 @@ udev_version.h:
 	@echo \#define UDEV_VERSION \"$(VERSION)\" > $@
 
 
-$(ROOT): $(GEN_HEADERS) $(OBJS)
-	$(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(ROOT): $(GEN_HEADERS) $(OBJS) $(LIBSYSFS) $(TDB)
+	$(MAKE) -C libsysfs
+	$(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) -lsysfs $(LIB_OBJS) -L$(LIB) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $(ROOT)
 
 clean:
@@ -130,6 +148,8 @@ clean:
 	 | xargs rm -f 
 	-rm -f core $(ROOT) $(GEN_HEADERS)
 	$(MAKE) -C klibc clean
+	$(MAKE) -C libsysfs clean
+	$(MAKE) -C tdb clean
 
 DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v CVS | grep -v "\.tar\.gz" | grep -v "\/\." | grep -v releases | grep -v BitKeeper | grep -v SCCS )
 DISTDIR := $(RELEASE_NAME)