chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fixup path for kernel includes when building with klibc.
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 493cd08450cd5a6b8333fad64e9d39b9e035380a..82ea0bc309214713fea08ed0e6d79797f0a0526e 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-22,7
+22,7
@@
DEBUG = true
ROOT = udev
ROOT = udev
-VERSION = 00
3
+VERSION = 00
5
INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION)
INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION)
@@
-74,7
+74,8
@@
GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
then echo "-Os"; else echo "-O2" ; fi}
OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
then echo "-Os"; else echo "-O2" ; fi}
-WARNINGS := -Wall -Wshadow -Wstrict-prototypes
+# add -Wredundant-decls when libsysfs gets cleaned up
+WARNINGS := -Wall -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
# Some nice architecture specific optimizations
ifeq ($(strip $(TARGET_ARCH)),arm)
# Some nice architecture specific optimizations
ifeq ($(strip $(TARGET_ARCH)),arm)
@@
-124,15
+125,21
@@
else
LDFLAGS = --static
endif
LDFLAGS = --static
endif
-LIB=libsysfs
-
all: $(LIBC) $(ROOT)
$(ARCH_LIB_OBJS) :
$(MAKE) -C klibc
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 \
OBJS = udev.o \
udev-add.o \
@@
-140,14
+147,10
@@
OBJS = udev.o \
udevdb.o \
logging.o \
namedev.o \
udevdb.o \
logging.o \
namedev.o \
+ klibc_fixups.o \
+ $(SYSFS) \
$(TDB)
$(TDB)
-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
@@
-158,9
+161,8
@@
udev_version.h:
@echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
@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:
$(STRIPCMD) $(ROOT)
clean:
@@
-168,10
+170,8
@@
clean:
| xargs rm -f
-rm -f core $(ROOT) $(GEN_HEADERS)
$(MAKE) -C klibc 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" | sort )
+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)
srcdir = .
release: $(DISTFILES) clean
DISTDIR := $(RELEASE_NAME)
srcdir = .
release: $(DISTFILES) clean
@@
-197,14
+197,14
@@
install: all
$(INSTALL) -d $(hotplugdir)
$(INSTALL_PROGRAM) -D $(ROOT) $(sbindir)/$(ROOT)
$(INSTALL_DATA) -D udev.8 $(mandir)/man8/udev.8
$(INSTALL) -d $(hotplugdir)
$(INSTALL_PROGRAM) -D $(ROOT) $(sbindir)/$(ROOT)
$(INSTALL_DATA) -D udev.8 $(mandir)/man8/udev.8
- $(INSTALL_DATA)
name
dev.config $(configdir)
- $(INSTALL_DATA)
name
dev.permissions $(configdir)
+ $(INSTALL_DATA)
u
dev.config $(configdir)
+ $(INSTALL_DATA)
u
dev.permissions $(configdir)
- ln -s $(sbindir)/$(ROOT) $(hotplugdir)/udev.hotplug
uninstall:
- rm $(hotplugdir)/udev.hotplug
- ln -s $(sbindir)/$(ROOT) $(hotplugdir)/udev.hotplug
uninstall:
- rm $(hotplugdir)/udev.hotplug
- - rm $(configdir)/
name
dev.permissions
- - rm $(configdir)/
name
dev.config
+ - rm $(configdir)/
u
dev.permissions
+ - rm $(configdir)/
u
dev.config
- rm $(mandir)/man8/udev.8
- rm $(sbindir)/$(ROOT)
- rmdir $(hotplugdir)
- rm $(mandir)/man8/udev.8
- rm $(sbindir)/$(ROOT)
- rmdir $(hotplugdir)