switch tools and volume_id from LGPL to GPLv2

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 2017e7be3bf627bc3c2a16d60609db372d8fd301..ed5a87c4276f56ba4a19118fb03040424f037883 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-VERSION =      068
+VERSION =      070
 
 # set this to make use of syslog
 USE_LOG = true
@@ -147,8 +147,6 @@ STRIP = $(CROSS)strip
 RANLIB = $(CROSS)ranlib
 HOSTCC = gcc
 
-export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS
-
 # code taken from uClibc to determine the current arch
 ARCH := ${shell $(CC) -dumpmachine | sed -e s'/-.*//' -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \
        -e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/powerpc/ppc/g'}
@@ -229,7 +227,12 @@ all: $(KLCC) $(PROGRAMS) $(MAN_PAGES)
        @extras="$(EXTRAS)"; for target in $$extras; do \
                echo $$target; \
                $(MAKE) prefix=$(prefix) \
+                       CC="$(CC)" \
+                       CFLAGS="$(CFLAGS)" \
                        LD="$(LD)" \
+                       LDFLAGS="$(LDFLAGS)" \
+                       STRIPCMD="$(STRIPCMD)" \
+                       LIB_OBJS="$(LIB_OBJS)" \
                        LIBUDEV="$(PWD)/$(LIBUDEV)" \
                        LIBSYSFS="$(PWD)/$(LIBSYSFS)" \
                        KERNEL_DIR="$(KERNEL_DIR)" \
@@ -243,7 +246,7 @@ all: $(KLCC) $(PROGRAMS) $(MAN_PAGES)
 .SUFFIXES:
 
 # build the objects
-%.o: %.c
+%.o: %.c $(GEN_HEADERS)
        $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
 # "Static Pattern Rule" to build all programs
@@ -333,6 +336,10 @@ install-config: $(GEN_CONFIGS)
                echo "pick a udev rules file from the etc/udev directory that matches your distribution"; \
                echo; \
        fi
+       @extras="$(EXTRAS)"; for target in $$extras; do \
+               echo $$target; \
+               $(MAKE) prefix=$(prefix) -C $$target $@; \
+       done;
 .PHONY: install-config
 
 install-man:
@@ -344,17 +351,25 @@ install-man:
        $(INSTALL_DATA) -D udevsend.8 $(DESTDIR)$(mandir)/man8/udevsend.8
        $(INSTALL_DATA) -D udevmonitor.8 $(DESTDIR)$(mandir)/man8/udevmonitor.8
        - ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8
+       @extras="$(EXTRAS)"; for target in $$extras; do \
+               echo $$target; \
+               $(MAKE) prefix=$(prefix) -C $$target $@; \
+       done;
 .PHONY: install-man
 
 uninstall-man:
-       - rm $(mandir)/man8/udev.8
-       - rm $(mandir)/man8/udevinfo.8
-       - rm $(mandir)/man8/udevtest.8
-       - rm $(mandir)/man8/udevstart.8
-       - rm $(mandir)/man8/udevd.8
-       - rm $(mandir)/man8/udevmonitor.8
-       - rm $(mandir)/man8/udevsend.8
-       - rm $(mandir)/man8/udevcontrol.8
+       - rm -f $(mandir)/man8/udev.8
+       - rm -f $(mandir)/man8/udevinfo.8
+       - rm -f $(mandir)/man8/udevtest.8
+       - rm -f $(mandir)/man8/udevstart.8
+       - rm -f $(mandir)/man8/udevd.8
+       - rm -f $(mandir)/man8/udevmonitor.8
+       - rm -f $(mandir)/man8/udevsend.8
+       - rm -f $(mandir)/man8/udevcontrol.8
+       @extras="$(EXTRAS)"; for target in $$extras; do \
+               echo $$target; \
+               $(MAKE) prefix=$(prefix) -C $$target $@; \
+       done;
 .PHONY: uninstall-man
 
 install-bin:
@@ -367,28 +382,28 @@ install-bin:
        $(INSTALL_PROGRAM) -D udevinfo $(DESTDIR)$(usrbindir)/udevinfo
        $(INSTALL_PROGRAM) -D udevtest $(DESTDIR)$(usrbindir)/udevtest
        $(INSTALL_PROGRAM) -D udevstart $(DESTDIR)$(sbindir)/udevstart
+       @extras="$(EXTRAS)"; for target in $$extras; do \
+               echo $$target; \
+               $(MAKE) prefix=$(prefix) -C $$target $@; \
+       done;
 ifndef DESTDIR
        - killall udevd
        - rm -rf $(udevdb)
        - $(sbindir)/udevd --daemon
 endif
-       @extras="$(EXTRAS)"; for target in $$extras; do \
-               echo $$target; \
-               $(MAKE) prefix=$(prefix) -C $$target $@; \
-       done;
 .PHONY: install-bin
 
 uninstall-bin:
-       - rm $(sbindir)/udev
-       - rm $(sbindir)/udevd
-       - rm $(sbindir)/udevsend
-       - rm $(sbindir)/udevinitsend
-       - rm $(sbindir)/udeveventrecoreder
-       - rm $(sbindir)/udevcontrol
-       - rm $(sbindir)/udevstart
-       - rm $(usrsbindir)/udevmonitor
-       - rm $(usrbindir)/udevinfo
-       - rm $(usrbindir)/udevtest
+       - rm -f $(sbindir)/udev
+       - rm -f $(sbindir)/udevd
+       - rm -f $(sbindir)/udevsend
+       - rm -f $(sbindir)/udevinitsend
+       - rm -f $(sbindir)/udeveventrecoreder
+       - rm -f $(sbindir)/udevcontrol
+       - rm -f $(sbindir)/udevstart
+       - rm -f $(usrsbindir)/udevmonitor
+       - rm -f $(usrbindir)/udevinfo
+       - rm -f $(usrbindir)/udevtest
        - rm -rf $(udevdb)
        - killall udevd
        @extras="$(EXTRAS)"; for target in $$extras; do \