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] make spotless for releases.
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index a3aa2ecb8b9afd8a058c2cacdf070455d7eb075b..e1a4b9fe2738bfa8ef2558d02aef06a3124b0ea9 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-35,7
+35,7
@@
INFO = udevinfo
TESTER = udevtest
STARTER = udevstart
WAIT = wait_for_sysfs
TESTER = udevtest
STARTER = udevstart
WAIT = wait_for_sysfs
-VERSION = 04
4
+VERSION = 04
5
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
@@
-68,7
+68,8
@@
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
EXTRAS=
# place to put our device nodes
EXTRAS=
# place to put our device nodes
-udevdir = ${prefix}/udev
+udevdir = ${prefix}/udev
+udevdb = ${udevdir}/.udevdb
# Comment out this line to build with something other
# than the local version of klibc
# Comment out this line to build with something other
# than the local version of klibc
@@
-113,11
+114,6
@@
WARNINGS := -Wall
CFLAGS := -pipe
CFLAGS := -pipe
-# set up the proper tdb spinlock code if we can
-ifeq ($(strip $(ARCH)),i386)
- CFLAGS += -DUSE_SPINLOCKS -DINTEL_SPINLOCKS
-endif
-
ifeq ($(strip $(USE_LOG)),true)
CFLAGS += -DLOG
endif
ifeq ($(strip $(USE_LOG)),true)
CFLAGS += -DLOG
endif
@@
-201,9
+197,6
@@
$(CRT0):
fi
$(MAKE) -C klibc SUBDIRS=klibc
fi
$(MAKE) -C klibc SUBDIRS=klibc
-TDB = tdb/tdb.o \
- tdb/spinlock.o
-
SYSFS = $(PWD)/libsysfs/sysfs_bus.o \
$(PWD)/libsysfs/sysfs_class.o \
$(PWD)/libsysfs/sysfs_device.o \
SYSFS = $(PWD)/libsysfs/sysfs_bus.o \
$(PWD)/libsysfs/sysfs_class.o \
$(PWD)/libsysfs/sysfs_device.o \
@@
-221,8
+214,7
@@
OBJS = udev_lib.o \
namedev.o \
namedev_parse.o \
dev_d.o \
namedev.o \
namedev_parse.o \
dev_d.o \
- $(SYSFS) \
- $(TDB)
+ $(SYSFS)
HEADERS = udev.h \
udev_lib.h \
HEADERS = udev.h \
udev_lib.h \
@@
-262,8
+254,8
@@
ccdv:
udev_version.h:
@echo "Creating udev_version.h"
@echo \#define UDEV_VERSION \"$(VERSION)\" > $@
udev_version.h:
@echo "Creating udev_version.h"
@echo \#define UDEV_VERSION \"$(VERSION)\" > $@
- @echo \#define UDEV_ROOT \"$(udevdir)
/
\" >> $@
- @echo \#define UDEV_DB \"$(udevd
ir)/.udev.tdb
\" >> $@
+ @echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
+ @echo \#define UDEV_DB \"$(udevd
b)
\" >> $@
@echo \#define UDEV_CONFIG_DIR \"$(configdir)\" >> $@
@echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@
@echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@
@echo \#define UDEV_CONFIG_DIR \"$(configdir)\" >> $@
@echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@
@echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@
@@
-300,7
+292,7
@@
$(TESTER): $(LIBC) $(TESTER).o $(OBJS) $(HEADERS)
$(QUIET) $(STRIPCMD) $@
$(INFO): $(LIBC) $(INFO).o $(OBJS) $(HEADERS)
$(QUIET) $(STRIPCMD) $@
$(INFO): $(LIBC) $(INFO).o $(OBJS) $(HEADERS)
- $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(
TDB) $(
LIB_OBJS) $(ARCH_LIB_OBJS)
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
$(DAEMON): $(LIBC) $(DAEMON).o $(OBJS) udevd.h
$(QUIET) $(STRIPCMD) $@
$(DAEMON): $(LIBC) $(DAEMON).o $(OBJS) udevd.h
@@
-337,10
+329,10
@@
spotless: clean
$(MAKE) -C klibc spotless
-rm -f klibc/linux
$(MAKE) -C klibc spotless
-rm -f klibc/linux
-DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz
$" -e "\/\." -e releases -e BitKeeper -e SCCS -e "\.tdb$"
-e test/sys | sort )
+DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz
" -e "\/\." -e releases -e BitKeeper -e SCCS
-e test/sys | sort )
DISTDIR := $(RELEASE_NAME)
srcdir = .
DISTDIR := $(RELEASE_NAME)
srcdir = .
-release:
clean
+release:
spotless
-rm -rf $(DISTDIR)
mkdir $(DISTDIR)
chmod 777 $(DISTDIR)
-rm -rf $(DISTDIR)
mkdir $(DISTDIR)
chmod 777 $(DISTDIR)
@@
-350,7
+342,7
@@
release: clean
@echo "$(RELEASE_NAME).tar.gz created"
@echo "$(RELEASE_NAME).tar.gz created"
-small_release: $(DISTFILES)
clean
+small_release: $(DISTFILES)
spotless
# @echo $(DISTFILES)
@-rm -rf $(DISTDIR)
@mkdir $(DISTDIR)
# @echo $(DISTFILES)
@-rm -rf $(DISTDIR)
@mkdir $(DISTDIR)
@@
-429,8
+421,8
@@
install: install-initscript install-config install-man install-dev.d all
- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/10-udev.hotplug
- ln -f -s $(sbindir)/$(WAIT) $(DESTDIR)$(hotplugdir)/05-wait_for_sysfs.hotplug
ifndef DESTDIR
- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/10-udev.hotplug
- ln -f -s $(sbindir)/$(WAIT) $(DESTDIR)$(hotplugdir)/05-wait_for_sysfs.hotplug
ifndef DESTDIR
- - killall
udevd
- - rm -
f $(udevdir)/.udev.tdb
+ - killall
$(DAEMON)
+ - rm -
rf $(udevdb)
endif
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
endif
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
@@
-456,8
+448,9
@@
uninstall: uninstall-man uninstall-dev.d
- rm $(usrbindir)/$(TESTER)
- rm $(usrbindir)/$(WAIT)
- rmdir $(hotplugdir)
- rm $(usrbindir)/$(TESTER)
- rm $(usrbindir)/$(WAIT)
- rmdir $(hotplugdir)
- - rm
$(udevdir)/.udev.tdb
+ - rm
-rf $(udevdb)
- rmdir $(udevdir)
- rmdir $(udevdir)
+ - killall $(DAEMON)
@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)" \