summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2005-03-06 10:15:51 +0100
committerGreg KH <gregkh@suse.de>2005-04-26 23:48:48 -0700
commit6c18b1fb8784606c83adab89e306534d3b943aa3 (patch)
tree65157e96aff497101e22fe8a18f75a42639e9ae9
parent57e1a2770c4d85edd377488906c437f6d1e9b369 (diff)
[PATCH] rename LOG to USE_LOG in all places
-rw-r--r--Makefile50
-rw-r--r--extras/volume_id/udev_volume_id.c2
-rw-r--r--logging.h4
-rw-r--r--make_gcov.sh2
-rw-r--r--udev.c2
-rw-r--r--udevd.c4
-rw-r--r--udevinfo.c3
-rw-r--r--udevsend.c2
-rw-r--r--udevtest.c2
9 files changed, 34 insertions, 37 deletions
diff --git a/Makefile b/Makefile
index baecda66f3..f2d445d627 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
# Makefile for udev
#
# Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
+# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,18 +17,28 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# Set the following to control the use of syslog
-# Set it to `false' to remove all logging
+# Set this to make use of syslog
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.
+# Set this to ad development debug messages
DEBUG = false
-# Set this to compile with Security-Enhanced Linux support.
+# Set this to include Security-Enhanced Linux support.
USE_SELINUX = false
+# Set this to comile with the local version of klibc instead of glibc.
+USE_KLIBC = false
+
+# Set this to create statically linked binaries.
+USE_STATIC = false
+
+# To build any of the extras programs, run with:
+# make EXTRAS="extras/a extras/b"
+EXTRAS=
+
+# make the build silent. Set this to something else to make it noisy again.
+V=false
+
ROOT = udev
DAEMON = udevd
SENDER = udevsend
@@ -39,9 +50,7 @@ INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION)
LOCAL_CFG_DIR = etc/udev
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
@@ -62,22 +71,10 @@ INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
-# To build any of the extras programs, run with:
-# make EXTRAS="extras/a extras/b"
-EXTRAS=
-
# place to put our device nodes
udevdir = ${prefix}/udev
udevdb = ${udevdir}/.udevdb
-# Comment out this line to build with something other
-# than the local version of klibc
-#USE_KLIBC = true
-
-# make the build silent (well, at least the udev part) Set this
-# to something else to make it noisy again.
-V=false
-
# set up PWD so that older versions of make will work with our build.
PWD = $(shell pwd)
@@ -160,7 +157,7 @@ CFLAGS += -I$(PWD)/libsysfs/sysfs \
-I$(PWD)/libsysfs
ifeq ($(strip $(USE_LOG)),true)
- CFLAGS += -DLOG
+ CFLAGS += -DUSE_LOG
endif
# if DEBUG is enabled, then we do not strip or optimize
@@ -182,10 +179,7 @@ ifeq ($(strip $(USE_KLIBC)),true)
INCLUDE_DIR := $(KLIBC_BASE)/include
LINUX_INCLUDE_DIR := $(KERNEL_DIR)/include
include $(KLIBC_DIR)/arch/$(ARCH)/MCONFIG
- # arch specific objects
ARCH_LIB_OBJS = $(KLIBC_DIR)/libc.a
-
-
CRT0 = $(KLIBC_DIR)/crt0.o
LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
CFLAGS += $(WARNINGS) -nostdinc \
@@ -197,8 +191,7 @@ ifeq ($(strip $(USE_KLIBC)),true)
-I$(GCCINCDIR) \
-I$(LINUX_INCLUDE_DIR)
LIB_OBJS =
- LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
-
+ LDFLAGS = -static -nostdlib -nostartfiles -nodefaultlibs
else
WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
CRT0 =
@@ -213,6 +206,11 @@ ifeq ($(strip $(USE_SELINUX)),true)
CFLAGS += -DUSE_SELINUX
endif
+ifeq ($(strip $(USE_STATIC)),true)
+ CFLAGS += -DUSE_STATIC
+ LDFLAGS += -static
+endif
+
ifeq ($(strip $(V)),false)
QUIET=@$(PWD)/ccdv
HOST_PROGS=ccdv
diff --git a/extras/volume_id/udev_volume_id.c b/extras/volume_id/udev_volume_id.c
index c36b89f8bd..54d95270d0 100644
--- a/extras/volume_id/udev_volume_id.c
+++ b/extras/volume_id/udev_volume_id.c
@@ -35,7 +35,7 @@
#define BLKGETSIZE64 _IOR(0x12,114,size_t)
-#ifdef LOG
+#ifdef USE_LOG
void log_message(int level, const char *format, ...)
{
va_list args;
diff --git a/logging.h b/logging.h
index 4f51217b9a..3ff54ec974 100644
--- a/logging.h
+++ b/logging.h
@@ -30,7 +30,7 @@
#define logging_init(foo) do { } while (0)
#define logging_close(foo) do { } while (0)
-#ifdef LOG
+#ifdef USE_LOG
#include <stdarg.h>
#include <unistd.h>
#include <syslog.h>
@@ -73,6 +73,6 @@ static inline void logging_close(void)
closelog();
}
-#endif /* LOG */
+#endif /* USE_LOG */
#endif
diff --git a/make_gcov.sh b/make_gcov.sh
index 4d5f63f1dd..e3ceb96d07 100644
--- a/make_gcov.sh
+++ b/make_gcov.sh
@@ -28,7 +28,7 @@ GCCINCDIR=`gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"`
LIBSYSFS="-I$PWD/libsysfs/sysfs -I$PWD/libsysfs"
WARNINGS="-Wall -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations"
GCC="-I$GCCINCDIR"
-USE_LOG="-DLOG"
+USE_LOG="-DUSE_LOG"
DEBUG="-D_GNU_SOURCE"
GCOV_FLAGS="-pipe -fprofile-arcs -ftest-coverage"
diff --git a/udev.c b/udev.c
index c26ce46b64..76de8181d1 100644
--- a/udev.c
+++ b/udev.c
@@ -40,7 +40,7 @@
#include "logging.h"
-#ifdef LOG
+#ifdef USE_LOG
void log_message(int level, const char *format, ...)
{
va_list args;
diff --git a/udevd.c b/udevd.c
index bd21f15614..1376cf05c7 100644
--- a/udevd.c
+++ b/udevd.c
@@ -1,7 +1,7 @@
/*
* udevd.c - hotplug event serializer
*
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
* Copyright (C) 2004 Chris Friesen <chris_friesen@sympatico.ca>
*
*
@@ -67,7 +67,7 @@ static void user_sighandler(void);
static void reap_sigchilds(void);
char *udev_bin;
-#ifdef LOG
+#ifdef USE_LOG
void log_message (int level, const char *format, ...)
{
va_list args;
diff --git a/udevinfo.c b/udevinfo.c
index b2d22e984e..e30a036ac6 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -3,7 +3,6 @@
*
* Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
*
- *
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation version 2 of the License.
@@ -38,7 +37,7 @@
#define SYSFS_VALUE_SIZE 256
-#ifdef LOG
+#ifdef USE_LOG
void log_message (int level, const char *format, ...)
{
va_list args;
diff --git a/udevsend.c b/udevsend.c
index 5fe0f456a1..dcd5a2ae93 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -43,7 +43,7 @@
/* global variables */
static int sock = -1;
-#ifdef LOG
+#ifdef USE_LOG
void log_message (int level, const char *format, ...)
{
va_list args;
diff --git a/udevtest.c b/udevtest.c
index 4e02ac7dbc..084fde0706 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -36,7 +36,7 @@
#include "logging.h"
-#ifdef LOG
+#ifdef USE_LOG
void log_message (int level, const char *format, ...)
{
va_list args;