summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2003-08-06 00:03:30 -0700
committerGreg KH <gregkh@suse.de>2005-04-26 21:01:40 -0700
commita2822451e27dbc576343834e76d5382d5112ac24 (patch)
tree4598f987c81f235660edf5f350dff6101f678607
parent8e41d35d7675b7d47db3e27da4e1fd508d772c32 (diff)
[PATCH] merge tdb into the build process.
-rw-r--r--Makefile15
-rw-r--r--udev-add.c1
-rw-r--r--udevdb.c3
-rw-r--r--udevdb.h6
4 files changed, 17 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index a7bb01d247..3f9fef49d5 100644
--- a/Makefile
+++ b/Makefile
@@ -113,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
@@ -132,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)
@@ -143,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)
diff --git a/udev-add.c b/udev-add.c
index 5bd934acd0..c8aa2f70c9 100644
--- 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 udevice dbdev;
int major;
int minor;
char type;
diff --git a/udevdb.c b/udevdb.c
index b200f2f6ed..b976fd50ef 100644
--- a/udevdb.c
+++ b/udevdb.c
@@ -7,9 +7,10 @@
#include <string.h>
#include <sys/stat.h>
#include <errno.h>
+#include <signal.h>
#include "udevdb.h"
-#include "tdb.h"
+#include "tdb/tdb.h"
static TDB_CONTEXT *busdb;
static TDB_CONTEXT *classdb;
diff --git a/udevdb.h b/udevdb.h
index d2c4a5320e..fed52bc46a 100644
--- a/udevdb.h
+++ b/udevdb.h
@@ -7,9 +7,9 @@
#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