diff options
| author | greg@kroah.com <greg@kroah.com> | 2003-10-22 19:40:52 -0700 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-04-26 21:05:23 -0700 |
| commit | 5c75a3ecd1852abaf4d9ee67a37ee56b0cf0a6d3 (patch) | |
| tree | 51c03fb5faf9c90b9735d3b9582cee5480092b59 | |
| parent | 1c386a909af69bc5b53eb03fedead725f5fc8331 (diff) | |
[PATCH] build tdb and libsysfs from the same makefile as udev.
This fixes problem of libsysfs and tdb getting build with different gcc options
as the rest of udev.
| -rw-r--r-- | Makefile | 28 |
1 files changed, 13 insertions, 15 deletions
@@ -125,15 +125,21 @@ 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 +TDB = tdb/tdb.o \ + tdb/spinlock.o + +SYSFS = libsysfs/sysfs_bus.o \ + libsysfs/sysfs_class.o \ + libsysfs/sysfs_device.o \ + libsysfs/sysfs_dir.o \ + libsysfs/sysfs_driver.o \ + libsysfs/sysfs_utils.o \ + libsysfs/dlist.o OBJS = udev.o \ udev-add.o \ @@ -141,14 +147,9 @@ OBJS = udev.o \ udevdb.o \ logging.o \ namedev.o \ + $(SYSFS) \ $(TDB) -libsysfs/libsysfs.a: - $(MAKE) -C libsysfs - -tdb/tdb.o: - $(MAKE) -C tdb - # header files automatically generated GEN_HEADERS = udev_version.h @@ -159,9 +160,8 @@ udev_version.h: @echo \#define UDEV_ROOT \"$(udevdir)\" >> $@ -$(ROOT): $(GEN_HEADERS) $(OBJS) $(LIBSYSFS) $(TDB) - $(MAKE) -C libsysfs - $(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) -lsysfs $(LIB_OBJS) -L$(LIB) $(ARCH_LIB_OBJS) +$(ROOT): $(GEN_HEADERS) $(OBJS) + $(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS) $(STRIPCMD) $(ROOT) clean: @@ -169,8 +169,6 @@ 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 | grep -v "\.tdb" | grep -v "test\/sys" | sort ) DISTDIR := $(RELEASE_NAME) |