[rtems-libbsd commit] Makefile: Correct dependencies for parallelism
Joel Sherrill
joel at rtems.org
Sat Jul 14 16:31:05 UTC 2012
Module: rtems-libbsd
Branch: master
Commit: 865a290ee4de021d79919b9a220b6c764fce2114
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=865a290ee4de021d79919b9a220b6c764fce2114
Author: Joel Sherrill <joel.sherrill at oarcorp.com>
Date: Sat Jul 14 11:20:42 2012 -0500
Makefile: Correct dependencies for parallelism
---
Makefile | 11 ++++-------
freebsd-to-rtems.py | 11 ++++-------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index 6725746..f4be056 100644
--- a/Makefile
+++ b/Makefile
@@ -452,15 +452,12 @@ C_D_FILES = $(C_FILES:%.c=%.d)
LIB = libbsd.a
-all: lib_bsd lib_user
+all: $(LIB) lib_user
$(LIB): $(C_O_FILES)
$(AR) rcu $@ $^
-lib_bsd:
- $(MAKE) $(LIB)
-
-lib_user: install_bsd
+lib_user: $(LIB) install_bsd
$(MAKE) -C freebsd-userspace
CPU_SED = sed
@@ -471,9 +468,9 @@ CPU_SED += -e '/mips/d'
CPU_SED += -e '/sparc/d'
CPU_SED += -e '/sparc64/d'
-install: lib_bsd install_bsd lib_user install_user
+install: $(LIB) install_bsd lib_user install_user
-install_bsd:
+install_bsd: $(LIB)
install -d $(INSTALL_BASE)/include
install -c -m 644 $(LIB) $(INSTALL_BASE)
cd rtemsbsd; for i in `find freebsd -name '*.h'` ; do \
diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py
index 7abf183..2d0e59e 100755
--- a/freebsd-to-rtems.py
+++ b/freebsd-to-rtems.py
@@ -367,15 +367,12 @@ class ModuleManager:
'\n' \
'LIB = libbsd.a\n' \
'\n' \
- 'all: lib_bsd lib_user\n' \
+ 'all: $(LIB) lib_user\n' \
'\n' \
'$(LIB): $(C_O_FILES)\n' \
'\t$(AR) rcu $@ $^\n' \
'\n' \
- 'lib_bsd:\n' \
- '\t$(MAKE) $(LIB)\n' \
- '\n' \
- 'lib_user: install_bsd\n' \
+ 'lib_user: $(LIB) install_bsd\n' \
'\t$(MAKE) -C freebsd-userspace\n' \
'\n' \
'CPU_SED = sed\n' \
@@ -386,9 +383,9 @@ class ModuleManager:
'CPU_SED += -e \'/sparc/d\'\n' \
'CPU_SED += -e \'/sparc64/d\'\n' \
'\n' \
- 'install: lib_bsd install_bsd lib_user install_user\n' \
+ 'install: $(LIB) install_bsd lib_user install_user\n' \
'\n' \
- 'install_bsd:\n' \
+ 'install_bsd: $(LIB)\n' \
'\tinstall -d $(INSTALL_BASE)/include\n' \
'\tinstall -c -m 644 $(LIB) $(INSTALL_BASE)\n' \
'\tcd rtemsbsd; for i in `find freebsd -name \'*.h\'` ; do \\\n' \
More information about the vc
mailing list