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 0fd158a2c7070e93ba0af32d4c51d1b5e098cabc..e1846dd4c06e50a0c3bba216d926ffed5a4bc36d 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-33,12
+33,17
@@
USE_DBUS = false
ROOT = udev
DAEMON = udevd
SENDER = udevsend
ROOT = udev
DAEMON = udevd
SENDER = udevsend
-VERSION = 014_bk
+HELPER = udevinfo
+VERSION = 015_bk
INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION)
LOCAL_CFG_DIR = etc/udev
INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION)
LOCAL_CFG_DIR = etc/udev
+HOTPLUG_EXEC = $(ROOT)
DESTDIR =
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}
@@
-94,7
+99,7
@@
OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>
then echo "-Os"; else echo "-O2" ; fi}
# add -Wredundant-decls when libsysfs gets cleaned up
then echo "-Os"; else echo "-O2" ; fi}
# add -Wredundant-decls when libsysfs gets cleaned up
-WARNINGS := -Wall
-Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
+WARNINGS := -Wall
# Some nice architecture specific optimizations
ifeq ($(strip $(TARGET_ARCH)),arm)
# Some nice architecture specific optimizations
ifeq ($(strip $(TARGET_ARCH)),arm)
@@
-117,11
+122,11
@@
endif
# if DEBUG is enabled, then we do not strip or optimize
ifeq ($(strip $(DEBUG)),true)
# if DEBUG is enabled, then we do not strip or optimize
ifeq ($(strip $(DEBUG)),true)
- CFLAGS +=
$(WARNINGS)
-O1 -g -DDEBUG -D_GNU_SOURCE
+ CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE
LDFLAGS += -Wl,-warn-common
STRIPCMD = /bin/true -Since_we_are_debugging
else
LDFLAGS += -Wl,-warn-common
STRIPCMD = /bin/true -Since_we_are_debugging
else
- CFLAGS += $(
WARNINGS) $(
OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
+ CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
LDFLAGS += -s -Wl,-warn-common
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
endif
LDFLAGS += -s -Wl,-warn-common
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
endif
@@
-133,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 = \
@@
-142,25
+148,35
@@
ifeq ($(strip $(USE_KLIBC)),true)
CRT0 = $(KLIBC_DIR)/crt0.o
LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
CRT0 = $(KLIBC_DIR)/crt0.o
LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
- CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(KLIBC_DIR)/arch/$(ARCH)/include \
- -I$(INCLUDE_DIR)/bits$(BITSIZE) -I$(GCCINCDIR) -I$(LINUX_INCLUDE_DIR) \
- -D__KLIBC__ -fno-builtin-printf
+ CFLAGS += $(WARNINGS) -nostdinc \
+ -D__KLIBC__ -fno-builtin-printf \
+ -I$(INCLUDE_DIR) \
+ -I$(KLIBC_DIR)/arch/$(ARCH)/include \
+ -I$(INCLUDE_DIR)/bits$(BITSIZE) \
+ -I$(GCCINCDIR) \
+ -I$(LINUX_INCLUDE_DIR)
LIB_OBJS =
LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
LIB_OBJS =
LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
+ UDEVD =
else
else
+ WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
CRT0 =
LIBC =
CRT0 =
LIBC =
- CFLAGS += -I$(GCCINCDIR)
+ CFLAGS +=
$(WARNINGS)
-I$(GCCINCDIR)
LIB_OBJS = -lc
LDFLAGS =
LIB_OBJS = -lc
LDFLAGS =
+ UDEVD = $(DAEMON)
endif
CFLAGS += -I$(PWD)/libsysfs
endif
CFLAGS += -I$(PWD)/libsysfs
-all: $(ROOT) $(
DAEMON) $(SEND
ER)
+all: $(ROOT) $(
SENDER) $(UDEVD) $(HELP
ER)
@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 ; \
@@
-169,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
@@
-182,17
+198,24
@@
SYSFS = $(PWD)/libsysfs/sysfs_bus.o \
$(PWD)/libsysfs/sysfs_utils.o \
$(PWD)/libsysfs/dlist.o
$(PWD)/libsysfs/sysfs_utils.o \
$(PWD)/libsysfs/dlist.o
-OBJS = udev.o \
- udev_config.o \
+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) \
$(TDB)
namedev.o \
namedev_parse.o \
$(SYSFS) \
$(TDB)
+HEADERS = udev.h \
+ namedev.h \
+ udev_version.h \
+ udev_dbus.h \
+ udevdb.h \
+ klibc_fixups.h \
+ logging.h \
+ list.h
+
ifeq ($(strip $(USE_KLIBC)),true)
OBJS += klibc_fixups.o
endif
ifeq ($(strip $(USE_KLIBC)),true)
OBJS += klibc_fixups.o
endif
@@
-216,6
+239,10
@@
udev_version.h:
@echo \#define UDEV_CONFIG_FILE \"$(configdir)\udev.conf\" >> $@
@echo \#define UDEV_RULES_FILE \"$(configdir)\udev.rules\" >> $@
@echo \#define UDEV_PERMISSION_FILE \"$(configdir)\udev.permissions\" >> $@
@echo \#define UDEV_CONFIG_FILE \"$(configdir)\udev.conf\" >> $@
@echo \#define UDEV_RULES_FILE \"$(configdir)\udev.rules\" >> $@
@echo \#define UDEV_PERMISSION_FILE \"$(configdir)\udev.permissions\" >> $@
+ @echo \#define UDEV_BIN \"$(DESTDIR)$(sbindir)/udev\" >> $@
+ @echo \#define UDEVD_BIN \"$(DESTDIR)$(sbindir)/udevd\" >> $@
+ @echo \#define UDEVD_SOCK \"$(udevdir)/\.udevd.sock\" >> $@
+ @echo \#define UDEVD_LOCK \"$(udevdir)/\.udevd.lock\" >> $@
# config files automatically generated
GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf
# config files automatically generated
GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf
@@
-226,23
+253,28
@@
$(LOCAL_CFG_DIR)/udev.conf:
$(OBJS): $(GEN_HEADERS)
$(OBJS): $(GEN_HEADERS)
+udev.o: $(GEN_HEADERS)
+
+$(ROOT): udev.o $(OBJS) $(HEADERS) $(GEN_HEADERS)
+ $(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+ $(STRIPCMD) $@
-$(
ROOT): $(OBJS) udev.h namedev.h udev_version.h udev_dbus.h udevdb.h klibc_fixups.h logging.h list.h
- $(LD) $(LDFLAGS) -o $
(ROOT) $(CRT0) $(OBJS
) $(LIB_OBJS) $(ARCH_LIB_OBJS)
- $(STRIPCMD) $
(ROOT)
+$(
HELPER): udevinfo.o $(OBJS) $(HEADERS)
+ $(LD) $(LDFLAGS) -o $
@ $(CRT0) udevinfo.o udev_config.o udevdb.o $(SYSFS) $(TDB
) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+ $(STRIPCMD) $
@
-$(DAEMON):
$(ROOT)
udevd.h udevd.o
- $(LD) $(LDFLAGS) -
o $(DAEMON) $(CRT0) udevd.o logging
.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
- $(STRIPCMD) $
(ROOT)
+$(DAEMON): udevd.h udevd.o
+ $(LD) $(LDFLAGS) -
lpthread -o $@ $(CRT0) udevd
.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+ $(STRIPCMD) $
@
-$(SENDER):
$(ROOT)
udevd.h udevsend.o
- $(LD) $(LDFLAGS) -o $
(SENDER) $(CRT0) udevsend.o logging
.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
- $(STRIPCMD) $
(ROOT)
+$(SENDER): udevd.h udevsend.o
+ $(LD) $(LDFLAGS) -o $
@ $(CRT0) udevsend
.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+ $(STRIPCMD) $
@
clean:
-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
| xargs rm -f
clean:
-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
| xargs rm -f
- -rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(DAEMON) $(SENDER)
+ -rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(
HELPER) $(
DAEMON) $(SENDER)
$(MAKE) -C klibc clean
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
$(MAKE) -C klibc clean
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
@@
-315,15
+347,19
@@
install: install-config install-dbus-policy all
$(INSTALL) -d $(DESTDIR)$(udevdir)
$(INSTALL) -d $(DESTDIR)$(hotplugdir)
$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
$(INSTALL) -d $(DESTDIR)$(udevdir)
$(INSTALL) -d $(DESTDIR)$(hotplugdir)
$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
+ $(INSTALL_PROGRAM) -D $(DAEMON) $(DESTDIR)$(sbindir)/$(DAEMON)
+ $(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
+ $(INSTALL_PROGRAM) -D $(HELPER) $(DESTDIR)$(sbindir)/$(HELPER)
@if [ "x$(USE_LSB)" = "xtrue" ]; then \
$(INSTALL_PROGRAM) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev; \
@if [ "x$(USE_LSB)" = "xtrue" ]; then \
$(INSTALL_PROGRAM) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev; \
- ln -s $(DESTDIR)$(initdir)/udev $(sbin
_
dir)/rcudev; \
+ ln -s $(DESTDIR)$(initdir)/udev $(sbindir)/rcudev; \
else \
$(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
fi
$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
else \
$(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
fi
$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
- - rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
- - ln -f -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
+ $(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
+ - rm -f $(DESTDIR)$(hotplugdir)/$(HOTPLUG_EXEC).hotplug
+ - ln -f -s $(sbindir)/$(HOTPLUG_EXEC) $(DESTDIR)$(hotplugdir)/udev.hotplug
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
@@
-337,7
+373,11
@@
uninstall: uninstall-dbus-policy
- rm $(configdir)/udev.conf
- rm $(initdir)/udev
- rm $(mandir)/man8/udev.8
- rm $(configdir)/udev.conf
- rm $(initdir)/udev
- rm $(mandir)/man8/udev.8
+ - rm $(mandir)/man8/udevinfo.8
- rm $(sbindir)/$(ROOT)
- rm $(sbindir)/$(ROOT)
+ - rm $(sbindir)/$(DAEMON)
+ - rm $(sbindir)/$(SENDER)
+ - rm $(sbindir)/$(HELPER)
- rmdir $(hotplugdir)
- rmdir $(configdir)
- rmdir $(udevdir)
- rmdir $(hotplugdir)
- rmdir $(configdir)
- rmdir $(udevdir)