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] add KERNEL_DIR option so that the distros will be happy
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 05d5da5a33447f8bba18291f81f9886d448ebc5c..e1846dd4c06e50a0c3bba216d926ffed5a4bc36d 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-41,6
+41,9
@@
LOCAL_CFG_DIR = etc/udev
HOTPLUG_EXEC = $(ROOT)
DESTDIR =
HOTPLUG_EXEC = $(ROOT)
DESTDIR =
+
+KERNEL_DIR = /lib/modules/${shell uname -r}/build
+
# override this to make udev look in a different location for it's config files
prefix =
exec_prefix = ${prefix}
# override this to make udev look in a different location for it's config files
prefix =
exec_prefix = ${prefix}
@@
-135,7
+138,8
@@
ifeq ($(strip $(USE_KLIBC)),true)
KLIBC_BASE = $(PWD)/klibc
KLIBC_DIR = $(KLIBC_BASE)/klibc
INCLUDE_DIR := $(KLIBC_DIR)/include
KLIBC_BASE = $(PWD)/klibc
KLIBC_DIR = $(KLIBC_BASE)/klibc
INCLUDE_DIR := $(KLIBC_DIR)/include
- LINUX_INCLUDE_DIR := $(KLIBC_BASE)/linux/include
+ LINUX_INCLUDE_DIR := $(KERNEL_DIR)/include
+# LINUX_INCLUDE_DIR := $(KLIBC_BASE)/linux/include
include $(KLIBC_DIR)/arch/$(ARCH)/MCONFIG
# arch specific objects
ARCH_LIB_OBJS = \
include $(KLIBC_DIR)/arch/$(ARCH)/MCONFIG
# arch specific objects
ARCH_LIB_OBJS = \
@@
-161,15
+165,18
@@
else
CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
LIB_OBJS = -lc
LDFLAGS =
CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
LIB_OBJS = -lc
LDFLAGS =
- UDEVD = $(DAEMON)
$(SENDER)
+ UDEVD = $(DAEMON)
endif
CFLAGS += -I$(PWD)/libsysfs
endif
CFLAGS += -I$(PWD)/libsysfs
-all: $(ROOT) $(UDEVD) $(HELPER)
+all: $(ROOT) $(
SENDER) $(
UDEVD) $(HELPER)
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
- $(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
+ $(MAKE) prefix=$(prefix) \
+ LD="$(LD)" \
+ SYSFS="$(SYSFS)" \
+ KERNEL_DIR="$(KERNEL_DIR)" \
-C $$target $@ ; \
done ; \
-C $$target $@ ; \
done ; \
@@
-178,7
+185,7
@@
$(ROOT): $(LIBC)
$(ARCH_LIB_OBJS) : $(CRT0)
$(CRT0):
$(ARCH_LIB_OBJS) : $(CRT0)
$(CRT0):
- $(MAKE) -C klibc
+ $(MAKE) -C klibc
KERNEL_DIR=$(KERNEL_DIR)
TDB = tdb/tdb.o \
tdb/spinlock.o
TDB = tdb/tdb.o \
tdb/spinlock.o
@@
-195,7
+202,6
@@
OBJS = udev_config.o \
udev-add.o \
udev-remove.o \
udevdb.o \
udev-add.o \
udev-remove.o \
udevdb.o \
- logging.o \
namedev.o \
namedev_parse.o \
$(SYSFS) \
namedev.o \
namedev_parse.o \
$(SYSFS) \
@@
-254,15
+260,15
@@
$(ROOT): udev.o $(OBJS) $(HEADERS) $(GEN_HEADERS)
$(STRIPCMD) $@
$(HELPER): udevinfo.o $(OBJS) $(HEADERS)
$(STRIPCMD) $@
$(HELPER): udevinfo.o $(OBJS) $(HEADERS)
- $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o
logging.o
udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+ $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(STRIPCMD) $@
$(STRIPCMD) $@
-$(DAEMON): udevd.h udevd.o
udevd.o logging.o
- $(LD) $(LDFLAGS) -lpthread -o $@ $(CRT0) udevd.o
logging.o
$(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(DAEMON): udevd.h udevd.o
+ $(LD) $(LDFLAGS) -lpthread -o $@ $(CRT0) udevd.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(STRIPCMD) $@
$(STRIPCMD) $@
-$(SENDER): udevd.h udevsend.o
udevd.o logging.o
- $(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o
logging.o
$(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(SENDER): udevd.h udevsend.o
+ $(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(STRIPCMD) $@
clean:
$(STRIPCMD) $@
clean: