Changeset c2e2d0c in freewrt for tools/Makefile

Timestamp:

Jul 22, 2006, 4:08:05 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

c746a832

Parents:

07526d20

Message:

sanitise the way tools which must be in lbin/ (currently,
sed and pax/cpio/tar, but there will be more...) are handled:
make prereq invokes a special recursive target install-lbin
which copies them from the staging dir into lbin if they exist
there (i.e. are already installed), or removes the install stamp
otherwise. the tools' install-lbin target does however duplicate
a little code, this could be done better but it works OK like this

also, add a missing include to brcm-utils and fix pax' clean target

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@339 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• tools/Makefile (modified) (3 diffs)

tools/Makefile

@@ -1 @@
-# $Id$
+# $FreeWRT$
 
 include $(TOPDIR)/rules.mk
@@ -10 +10 @@
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
+TARGETS_INSTALL_LBIN:=$(patsubst %,%-install-lbin,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
 
 all: install
-install: check-lbin $(TARGETS_INSTALL)
+install: $(TARGETS_INSTALL)
+install-lbin: $(TARGETS_INSTALL_LBIN)
 clean: $(TARGETS_CLEAN)
-
-check-lbin:
-        @[ -e ${TOPDIR}/lbin/sed ] || \
-            rm -f $(TOOLS_STAMP_DIR)/.tools_sed-install
-        @[ -e ${TOPDIR}/lbin/pax ] || \
-            rm -f $(TOOLS_STAMP_DIR)/.tools_paxmirabilis-install
 
 $(STAGING_DIR):
@@ -59 +55 @@
         @touch $(TOOLS_STAMP_DIR)/.tools_$@
 
+%-install-lbin:
+        $(TRACE) tools/$(patsubst %-install-lbin,%,$@)/install-lbin; \
+        $(MAKE) -C $(patsubst %-install-lbin,%,$@) install-lbin \
+            $(MAKE_TRACE)
+
 %-clean:
         $(TRACE) tools/$(patsubst %-clean,%,$@)/clean