[PATCH] fix up 'make release' to use bk to build the export tree.

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 58e0bd51aff79913d7e054092129e638ddd4b3fd..f53e7ca2fdc1f6b52681366670686c27c5cca80d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ ROOT =                udev
 DAEMON =       udevd
 SENDER =       udevsend
 HELPER =       udevinfo
-VERSION =      015_bk
+VERSION =      016_bk
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
@@ -157,7 +157,6 @@ ifeq ($(strip $(USE_KLIBC)),true)
                -I$(LINUX_INCLUDE_DIR)
        LIB_OBJS =
        LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
-       UDEVD =
 else
        WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
        CRT0 =
@@ -165,12 +164,11 @@ else
        CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
        LIB_OBJS = -lc
        LDFLAGS =
-       UDEVD = $(DAEMON)
 endif
 
 CFLAGS += -I$(PWD)/libsysfs
 
-all: $(ROOT) $(SENDER) $(UDEVD) $(HELPER)
+all: $(ROOT) $(SENDER) $(DAEMON) $(HELPER)
        @extras="$(EXTRAS)" ; for target in $$extras ; do \
                echo $$target ; \
                $(MAKE) prefix=$(prefix) \
@@ -239,10 +237,9 @@ udev_version.h:
        @echo \#define UDEV_CONFIG_FILE \"$(configdir)\udev.conf\" >> $@
        @echo \#define UDEV_RULES_FILE  \"$(configdir)\udev.rules\" >> $@
        @echo \#define UDEV_PERMISSION_FILE     \"$(configdir)\udev.permissions\" >> $@
+       @echo \#define UDEV_LOG_DEFAULT \"yes\" >> $@
        @echo \#define UDEV_BIN         \"$(DESTDIR)$(sbindir)/udev\" >> $@
        @echo \#define UDEVD_BIN        \"$(DESTDIR)$(sbindir)/udevd\" >> $@
-       @echo \#define UDEVD_SOCK       \"$(udevdir)/\.udevd.sock\" >> $@
-       @echo \#define UDEVD_LOCK       \"$(udevdir)/\.udevd.lock\" >> $@
 
 # config files automatically generated
 GEN_CONFIGS =  $(LOCAL_CFG_DIR)/udev.conf
@@ -259,15 +256,15 @@ $(ROOT): udev.o $(OBJS) $(HEADERS) $(GEN_HEADERS)
        $(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 
-$(HELPER): udevinfo.o $(OBJS) $(HEADERS)
+$(HELPER): $(HEADERS) udevinfo.o $(OBJS)
        $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 
-$(DAEMON): udevd.h udevd.o
-       $(LD) $(LDFLAGS) -lpthread -o $@ $(CRT0) udevd.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(DAEMON): udevd.h $(GEN_HEADERS) udevd.o
+       $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 
-$(SENDER): udevd.h udevsend.o
+$(SENDER): udevd.h $(GEN_HEADERS) udevsend.o
        $(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 
@@ -286,15 +283,13 @@ DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.ta
 DISTDIR := $(RELEASE_NAME)
 srcdir = .
 release: clean
-       @echo "--------------------------cut here------------------------"
-       @echo "cd .."
-       @echo "rm -rf $(DISTDIR)"
-       @echo "mkdir $(DISTDIR)"
-       @echo "chmod 777 $(DISTDIR)"
-       @echo "cp -avr udev/* $(DISTDIR)"
-       @echo "tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz"
-       @echo "rm -rf $(DISTDIR)"
-       @echo "--------------------------cut here------------------------"
+       -rm -rf $(DISTDIR)
+       mkdir $(DISTDIR)
+       chmod 777 $(DISTDIR)
+       bk export $(DISTDIR)
+       tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz
+       rm -rf $(DISTDIR)
+       @echo "$(RELEASE_NAME).tar.gz created"
 
 
 small_release: $(DISTFILES) clean