[PATCH] Added tdb code from latest cvs version in the samba tree

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index c31f61d8407de09a9a880ccc947d14933ae9a695..a7bb01d247cfcc4685e919b7bd1390d7005d412c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,10 +22,9 @@ DEBUG = true
 
 
 ROOT =         udev
-#PREFIX =      diet
-VERSION =      0.01
+VERSION =      0.2
 INSTALL_DIR =  /usr/local/bin
-RELEASE_NAME = $(PREFIX)$(ROOT)-$(VERSION)
+RELEASE_NAME = $(ROOT)-$(VERSION)
 
 
 # Comment out this line to build with something other 
@@ -39,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/' \
@@ -105,14 +106,23 @@ else
        LDFLAGS = --static 
 endif
 
+LIB=libsysfs
+
 all: $(LIBC) $(ROOT)
 
 $(ARCH_LIB_OBJS) :
        $(MAKE) -C klibc
 
 OBJS = udev.o          \
-       logging.o
+       udev-add.o      \
+       udev-remove.o   \
+       logging.o       \
+       namedev.o
+
+LIBSYSFS = libsysfs/libsysfs.a
 
+libsysfs/libsysfs.a:
+       $(MAKE) -C libsysfs
 
 # header files automatically generated
 GEN_HEADERS =  udev_version.h
@@ -122,8 +132,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)
+       $(MAKE) -C libsysfs
+       $(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) -lsysfs $(LIB_OBJS) -L$(LIB) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $(ROOT)
 
 clean:
@@ -131,6 +142,7 @@ clean:
         | xargs rm -f 
        -rm -f core $(ROOT) $(GEN_HEADERS)
        $(MAKE) -C klibc clean
+       $(MAKE) -C libsysfs 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)