[PATCH] merge tdb into the build process.

diff --git a/Makefile b/Makefile
index a7bb01d247cfcc4685e919b7bd1390d7005d412c..3f9fef49d5b3bcb54a2a870a3c410104c26e0a1c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -113,17 +113,23 @@ all: $(LIBC) $(ROOT)
 $(ARCH_LIB_OBJS) :
        $(MAKE) -C klibc
 
 $(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   \
 OBJS = udev.o          \
        udev-add.o      \
        udev-remove.o   \

+       udevdb.o        \

        logging.o       \
        logging.o       \

-       namedev.o
-
-LIBSYSFS = libsysfs/libsysfs.a
+       namedev.o       \
+       $(TDB)

 
 libsysfs/libsysfs.a:
        $(MAKE) -C libsysfs
 
 
 libsysfs/libsysfs.a:
        $(MAKE) -C libsysfs
 

+tdb/tdb.o:
+       $(MAKE) -C tdb
+

 # header files automatically generated
 GEN_HEADERS =  udev_version.h
 
 # header files automatically generated
 GEN_HEADERS =  udev_version.h
 


@@ -132,7 +138,7 @@ udev_version.h:
        @echo \#define UDEV_VERSION \"$(VERSION)\" > $@
 
 
        @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)
        $(MAKE) -C libsysfs
        $(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) -lsysfs $(LIB_OBJS) -L$(LIB) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $(ROOT)


@@ -143,6 +149,7 @@ clean:
        -rm -f core $(ROOT) $(GEN_HEADERS)
        $(MAKE) -C klibc clean
        $(MAKE) -C libsysfs 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)
 
 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)

diff --git a/udev-add.c b/udev-add.c
index 5bd934acd06a29a578fd4b5928fdd7ece1f77e4c..c8aa2f70c9fe0a540de2b91f4645d39d166111b2 100644 (file)
--- a/udev-add.c
+++ b/udev-add.c
@@ -136,6 +136,7 @@ int udev_add_device(char *device, char *subsystem)
 {
        struct sysfs_class_device *class_dev;
        struct device_attr attr;
 {
        struct sysfs_class_device *class_dev;
        struct device_attr attr;

+       struct udevice dbdev;

        int major;
        int minor;
        char type;
        int major;
        int minor;
        char type;

diff --git a/udevdb.c b/udevdb.c
index b200f2f6edffd02853fa0b65609261b03418d56c..b976fd50ef44e11ee14cc5b9977b1f95ec9380da 100644 (file)
--- a/udevdb.c
+++ b/udevdb.c
@@ -7,9 +7,10 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <errno.h>

+#include <signal.h>

 
 #include "udevdb.h"
 
 #include "udevdb.h"

-#include "tdb.h"
+#include "tdb/tdb.h"

 
 static TDB_CONTEXT *busdb;
 static TDB_CONTEXT *classdb;
 
 static TDB_CONTEXT *busdb;
 static TDB_CONTEXT *classdb;

diff --git a/udevdb.h b/udevdb.h
index d2c4a5320ee820f9b4eade7584e34c0e57ce37e1..fed52bc46a70ced620dec0828ae5ca5059120741 100644 (file)
--- a/udevdb.h
+++ b/udevdb.h
@@ -7,9 +7,9 @@
 #include "namedev.h"
 #include "udev.h"
 
 #include "namedev.h"
 #include "udev.h"
 

-#define BUS_DB         "/home/stekloff/src/udev-0.2/busdb.tdb"
-#define CLASS_DB       "/home/stekloff/src/udev-0.2/classdb.tdb"
-#define NAME_DB                "/home/stekloff/src/udev-0.2/namedb.tdb"
+#define BUS_DB         "/home/greg/src/udev/busdb.tdb"
+#define CLASS_DB       "/home/greg/src/udev/classdb.tdb"
+#define NAME_DB                "/home/greg/src/udev/namedb.tdb"

 
 #define PATH_SIZE      256
 
 
 #define PATH_SIZE      256