chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rules: use long options for scsi_id
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index ac5702b77657ace83bf160ef208e546d390d6fc5..da89f8627435b877c01c75c90586ffeacb925956 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,6
+1,5
@@
-# Makefile for udev
#
#
-# Copyright (C) 2003
,
2004 Greg Kroah-Hartman <greg@kroah.com>
+# Copyright (C) 2003
-
2004 Greg Kroah-Hartman <greg@kroah.com>
# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
#
# This program is free software; you can redistribute it and/or modify
# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
#
# This program is free software; you can redistribute it and/or modify
@@
-14,10
+13,10
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-#
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
#
-VERSION =
096
+VERSION =
111
# set this to make use of syslog
USE_LOG = true
# set this to make use of syslog
USE_LOG = true
@@
-33,9
+32,6
@@
USE_GCOV = false
# include Security-Enhanced Linux support
USE_SELINUX = false
# include Security-Enhanced Linux support
USE_SELINUX = false
-# comile with klibc instead of glibc
-USE_KLIBC = false
-
# set this to create statically linked binaries
USE_STATIC = false
# set this to create statically linked binaries
USE_STATIC = false
@@
-47,7
+43,6
@@
EXTRAS =
V =
PROGRAMS = \
V =
PROGRAMS = \
- udev \
udevd \
udevtrigger \
udevsettle \
udevd \
udevtrigger \
udevsettle \
@@
-55,13
+50,15
@@
PROGRAMS = \
udevmonitor \
udevinfo \
udevtest \
udevmonitor \
udevinfo \
udevtest \
+ test-udev \
udevstart
HEADERS = \
udev.h \
udevstart
HEADERS = \
udev.h \
+ udevd.h \
udev_rules.h \
logging.h \
udev_rules.h \
logging.h \
- udev_
libc_wrapper.h
\
+ udev_
sysdeps.h
\
udev_selinux.h \
list.h
udev_selinux.h \
list.h
@@
-77,7
+74,7
@@
UDEV_OBJS = \
udev_utils_string.o \
udev_utils_file.o \
udev_utils_run.o \
udev_utils_string.o \
udev_utils_file.o \
udev_utils_run.o \
- udev_
libc_wrapper
.o
+ udev_
sysdeps
.o
LIBUDEV = libudev.a
MAN_PAGES = \
LIBUDEV = libudev.a
MAN_PAGES = \
@@
-93,7
+90,7
@@
MAN_PAGES = \
GEN_HEADERS = \
udev_version.h
GEN_HEADERS = \
udev_version.h
-prefix =
+prefix
?
=
etcdir = ${prefix}/etc
sbindir = ${prefix}/sbin
usrbindir = ${prefix}/usr/bin
etcdir = ${prefix}/etc
sbindir = ${prefix}/sbin
usrbindir = ${prefix}/usr/bin
@@
-104,25
+101,25
@@
configdir = ${etcdir}/udev
udevdir = /dev
DESTDIR =
udevdir = /dev
DESTDIR =
-INSTALL =
/usr/bin/
install -c
+INSTALL = install -c
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL
_PROGRAM
}
+INSTALL_SCRIPT = ${INSTALL}
PWD = $(shell pwd)
PWD = $(shell pwd)
-CROSS_COMPILE =
+CROSS_COMPILE
?
=
CC = $(CROSS_COMPILE)gcc
LD = $(CROSS_COMPILE)gcc
AR = $(CROSS_COMPILE)ar
RANLIB = $(CROSS_COMPILE)ranlib
CC = $(CROSS_COMPILE)gcc
LD = $(CROSS_COMPILE)gcc
AR = $(CROSS_COMPILE)ar
RANLIB = $(CROSS_COMPILE)ranlib
-CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS
+
= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \
-Wchar-subscripts -Wmissing-declarations -Wnested-externs \
-Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
CFLAGS += $(WARNINGS)
WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \
-Wchar-subscripts -Wmissing-declarations -Wnested-externs \
-Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
CFLAGS += $(WARNINGS)
-LDFLAGS = -Wl,-warn-common
+LDFLAGS
+
= -Wl,-warn-common
OPTFLAGS = -Os
CFLAGS += $(OPTFLAGS)
OPTFLAGS = -Os
CFLAGS += $(OPTFLAGS)
@@
-141,12
+138,6
@@
ifeq ($(strip $(USE_GCOV)),true)
LDFLAGS += -fprofile-arcs
endif
LDFLAGS += -fprofile-arcs
endif
-ifeq ($(strip $(USE_KLIBC)),true)
- KLCC = /usr/bin/$(CROSS_COMPILE)klcc
- CC = $(KLCC)
- LD = $(KLCC)
-endif
-
ifeq ($(strip $(USE_SELINUX)),true)
UDEV_OBJS += udev_selinux.o
LIB_OBJS += -lselinux -lsepol
ifeq ($(strip $(USE_SELINUX)),true)
UDEV_OBJS += udev_selinux.o
LIB_OBJS += -lselinux -lsepol
@@
-208,7
+199,7
@@
udev_version.h:
$(Q) echo \#define UDEV_VERSION \"$(VERSION)\" >> $@
$(Q) echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
$(Q) echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@
$(Q) echo \#define UDEV_VERSION \"$(VERSION)\" >> $@
$(Q) echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
$(Q) echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@
- $(Q) echo \#define UDEV_RULES_
FILE
\"$(configdir)/rules.d\" >> $@
+ $(Q) echo \#define UDEV_RULES_
DIR
\"$(configdir)/rules.d\" >> $@
# man pages
%.8 %.7: %.xml
# man pages
%.8 %.7: %.xml
@@
-235,8
+226,8
@@
clean:
.PHONY: clean
release:
.PHONY: clean
release:
- git-
tar-tree HEAD udev-$(VERSION)
| gzip -9v > udev-$(VERSION).tar.gz
- git-
tar-tree HEAD udev-$(VERSION)
| bzip2 -9v > udev-$(VERSION).tar.bz2
+ git-
archive --format=tar --prefix=udev-$(VERSION)/ HEAD
| gzip -9v > udev-$(VERSION).tar.gz
+ git-
archive --format=tar --prefix=udev-$(VERSION)/ HEAD
| bzip2 -9v > udev-$(VERSION).tar.bz2
.PHONY: release
install-config:
.PHONY: release
install-config:
@@
-335,10
+326,10
@@
buildtest:
ChangeLog: Makefile
@ mv $@ $@.tmp
ChangeLog: Makefile
@ mv $@ $@.tmp
- @ echo "Summary of changes from v$(shell
printf '%03i' $$(expr $(VERSION) - 1
)) to v$(VERSION)" >> $@
+ @ echo "Summary of changes from v$(shell
echo $$(($(VERSION) - 1)
)) to v$(VERSION)" >> $@
@ echo "============================================" >> $@
@ echo >> $@
@ echo "============================================" >> $@
@ echo >> $@
- @ git log --pretty=short $(shell
printf '%03i' $$(expr $(VERSION) - 1
))..HEAD | git shortlog >> $@
+ @ git log --pretty=short $(shell
echo $$(($(VERSION) - 1)
))..HEAD | git shortlog >> $@
@ echo >> $@
@ cat $@
@ cat $@.tmp >> $@
@ echo >> $@
@ cat $@
@ cat $@.tmp >> $@