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] clean up the logging patch a bit to make the option more like the other options.
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 36f0272d0216e265d9f4d5c1fe2575da464e2dee..f19354fb05ea9c5c8774f382cfc20e2867cf5661 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-16,7
+16,12
@@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# Set the following to `true' to make a debuggable build.
+# Set the following to control the use of syslog
+# Set it to `false' to remove all logging
+USE_LOG = true
+
+# Set the following to `true' to log the debug
+# and make a unstripped, unoptimized binary.
# Leave this set to `false' for production use.
DEBUG = false
# Leave this set to `false' for production use.
DEBUG = false
@@
-26,7
+31,7
@@
USE_DBUS = false
ROOT = udev
ROOT = udev
-VERSION = 01
2
_bk
+VERSION = 01
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
@@
-104,6
+109,10
@@
else
CFLAGS+=-pipe
endif
CFLAGS+=-pipe
endif
+ifeq ($(strip $(USE_LOG)),true)
+ CFLAGS += -DLOG
+endif
+
# if DEBUG is enabled, then we do not strip or optimize
ifeq ($(strip $(DEBUG)),true)
CFLAGS += $(WARNINGS) -O1 -g -DDEBUG -D_GNU_SOURCE
# if DEBUG is enabled, then we do not strip or optimize
ifeq ($(strip $(DEBUG)),true)
CFLAGS += $(WARNINGS) -O1 -g -DDEBUG -D_GNU_SOURCE
@@
-133,7
+142,7
@@
ifeq ($(strip $(USE_KLIBC)),true)
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) \
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__
+ -D__KLIBC__
-fno-builtin-printf
LIB_OBJS =
LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
else
LIB_OBJS =
LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
else
@@
-216,7
+225,7
@@
$(LOCAL_CFG_DIR)/udev.conf:
$(OBJS): $(GEN_HEADERS)
$(OBJS): $(GEN_HEADERS)
-$(ROOT): $(OBJS) udev.h namedev.h udev_version.h udev_dbus.h udevdb.h klibc_fixups.h list.h
+$(ROOT): $(OBJS) udev.h namedev.h udev_version.h udev_dbus.h udevdb.h klibc_fixups.h l
ogging.h l
ist.h
$(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(STRIPCMD) $(ROOT)
$(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(STRIPCMD) $(ROOT)
@@
-297,10
+306,10
@@
install: install-config install-dbus-policy all
$(INSTALL) -d $(DESTDIR)$(hotplugdir)
$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
@if [ "x$(USE_LSB)" = "xtrue" ]; then \
$(INSTALL) -d $(DESTDIR)$(hotplugdir)
$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
@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
- else
- $(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev
+ $(INSTALL_PROGRAM) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev
; \
+ ln -s $(DESTDIR)$(initdir)/udev $(sbin_dir)/rcudev
; \
+ 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
fi
$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
- rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug