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] udevd race conditions and performance, assorted cleanups - take 2
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 65d870bf97f96ff24eab5a9fcc68fd891aeb782a..652e712d775deca5f948bd42bb7a0e9adcd6fb03 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-33,7
+33,7
@@
INFO = udevinfo
TESTER = udevtest
STARTER = udevstart
RULER = udevruler
TESTER = udevtest
STARTER = udevstart
RULER = udevruler
-VERSION = 02
2
_bk
+VERSION = 02
3
_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
@@
-53,6
+53,7
@@
mandir = ${prefix}/usr/share/man
hotplugdir = ${etcdir}/hotplug.d/default
configdir = ${etcdir}/udev/
initdir = ${etcdir}/init.d/
hotplugdir = ${etcdir}/hotplug.d/default
configdir = ${etcdir}/udev/
initdir = ${etcdir}/init.d/
+dev_ddir = ${etcdir}/dev.d/
srcdir = .
INSTALL = /usr/bin/install -c
srcdir = .
INSTALL = /usr/bin/install -c
@@
-219,16
+220,9
@@
HEADERS = udev.h \
ifeq ($(strip $(USE_KLIBC)),true)
OBJS += klibc_fixups.o
ifeq ($(strip $(USE_KLIBC)),true)
OBJS += klibc_fixups.o
+ KLIBC_FIXUP = klibc_fixups.o
endif
endif
-# if USE_SELINUX is enabled, then we do not strip or optimize
-ifeq ($(strip $(USE_SELINUX)),true)
- CFLAGS += -DUSE_SELINUX
- OBJS += udev_selinux.o
- LIB_OBJS += -lselinux
-endif
-
-
# header files automatically generated
GEN_HEADERS = udev_version.h
# header files automatically generated
GEN_HEADERS = udev_version.h
@@
-273,8
+267,8
@@
$(INFO): $(INFO).o $(OBJS) $(HEADERS) $(LIBC)
$(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(STRIPCMD) $@
$(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(STRIPCMD) $@
-$(DAEMON): $(DAEMON).o udevd.h $(LIBC)
- $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(DAEMON): $(DAEMON).o
$(OBJS)
udevd.h $(LIBC)
+ $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o
udev_lib.o $(KLIBC_FIXUP)
$(LIB_OBJS) $(ARCH_LIB_OBJS)
$(STRIPCMD) $@
$(SENDER): $(SENDER).o udevd.h $(LIBC)
$(STRIPCMD) $@
$(SENDER): $(SENDER).o udevd.h $(LIBC)
@@
-357,7
+351,11
@@
install-config: $(GEN_CONFIGS)
$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
fi
$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
fi
-install: install-initscript install-config all
+install-dev.d:
+ $(INSTALL) -d $(DESTDIR)$(dev_ddir)
+ $(INSTALL) -d $(DESTDIR)$(dev_ddir)default/
+
+install: install-initscript install-config install-dev.d 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)
@@
-401,6
+399,8
@@
uninstall:
- rm $(usrbindir)/$(INFO)
- rmdir $(hotplugdir)
- rmdir $(configdir)
- rm $(usrbindir)/$(INFO)
- rmdir $(hotplugdir)
- rmdir $(configdir)
+ - rmdir $(dev_ddir)default
+ - rmdir $(dev_ddir)
- rm $(udevdir)/.udev.tdb
- rmdir $(udevdir)
@extras="$(EXTRAS)" ; for target in $$extras ; do \
- rm $(udevdir)/.udev.tdb
- rmdir $(udevdir)
@extras="$(EXTRAS)" ; for target in $$extras ; do \