[PATCH] do not build the tdb binary programs, only the objects.

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 989eb403bf4023821c06483d37b3145ea5514748..3f9fef49d5b3bcb54a2a870a3c410104c26e0a1c 100644 (file)
--- 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/' \
@@ -111,17 +113,23 @@ all: $(LIBC) $(ROOT)
 $(ARCH_LIB_OBJS) :
        $(MAKE) -C klibc
 
+LIBSYSFS = libsysfs/libsysfs.a
+TDB = tdb/tdb.o tdb/spinlock.o
+
 OBJS = udev.o          \
        udev-add.o      \
        udev-remove.o   \
+       udevdb.o        \
        logging.o       \
-       namedev.o
-
-LIBSYSFS = libsysfs/libsysfs.a
+       namedev.o       \
+       $(TDB)
 
 libsysfs/libsysfs.a:
        $(MAKE) -C libsysfs
 
+tdb/tdb.o:
+       $(MAKE) -C tdb
+
 # header files automatically generated
 GEN_HEADERS =  udev_version.h
 
@@ -130,7 +138,7 @@ udev_version.h:
        @echo \#define UDEV_VERSION \"$(VERSION)\" > $@
 
 
-$(ROOT): $(GEN_HEADERS) $(OBJS) $(LIBSYSFS)
+$(ROOT): $(GEN_HEADERS) $(OBJS) $(LIBSYSFS) $(TDB)
        $(MAKE) -C libsysfs
        $(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) -lsysfs $(LIB_OBJS) -L$(LIB) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $(ROOT)
@@ -141,6 +149,7 @@ clean:
        -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)