Makefile: Correct dependencies for parallelism

This commit is contained in:
Joel Sherrill 2012-07-14 11:20:42 -05:00
parent 0d0637ffaf
commit 865a290ee4
2 changed files with 8 additions and 14 deletions

View File

@ -452,15 +452,12 @@ C_D_FILES = $(C_FILES:%.c=%.d)
LIB = libbsd.a LIB = libbsd.a
all: lib_bsd lib_user all: $(LIB) lib_user
$(LIB): $(C_O_FILES) $(LIB): $(C_O_FILES)
$(AR) rcu $@ $^ $(AR) rcu $@ $^
lib_bsd: lib_user: $(LIB) install_bsd
$(MAKE) $(LIB)
lib_user: install_bsd
$(MAKE) -C freebsd-userspace $(MAKE) -C freebsd-userspace
CPU_SED = sed CPU_SED = sed
@ -471,9 +468,9 @@ CPU_SED += -e '/mips/d'
CPU_SED += -e '/sparc/d' CPU_SED += -e '/sparc/d'
CPU_SED += -e '/sparc64/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 -d $(INSTALL_BASE)/include
install -c -m 644 $(LIB) $(INSTALL_BASE) install -c -m 644 $(LIB) $(INSTALL_BASE)
cd rtemsbsd; for i in `find freebsd -name '*.h'` ; do \ cd rtemsbsd; for i in `find freebsd -name '*.h'` ; do \

View File

@ -367,15 +367,12 @@ class ModuleManager:
'\n' \ '\n' \
'LIB = libbsd.a\n' \ 'LIB = libbsd.a\n' \
'\n' \ '\n' \
'all: lib_bsd lib_user\n' \ 'all: $(LIB) lib_user\n' \
'\n' \ '\n' \
'$(LIB): $(C_O_FILES)\n' \ '$(LIB): $(C_O_FILES)\n' \
'\t$(AR) rcu $@ $^\n' \ '\t$(AR) rcu $@ $^\n' \
'\n' \ '\n' \
'lib_bsd:\n' \ 'lib_user: $(LIB) install_bsd\n' \
'\t$(MAKE) $(LIB)\n' \
'\n' \
'lib_user: install_bsd\n' \
'\t$(MAKE) -C freebsd-userspace\n' \ '\t$(MAKE) -C freebsd-userspace\n' \
'\n' \ '\n' \
'CPU_SED = sed\n' \ 'CPU_SED = sed\n' \
@ -386,9 +383,9 @@ class ModuleManager:
'CPU_SED += -e \'/sparc/d\'\n' \ 'CPU_SED += -e \'/sparc/d\'\n' \
'CPU_SED += -e \'/sparc64/d\'\n' \ 'CPU_SED += -e \'/sparc64/d\'\n' \
'\n' \ '\n' \
'install: lib_bsd install_bsd lib_user install_user\n' \ 'install: $(LIB) install_bsd lib_user install_user\n' \
'\n' \ '\n' \
'install_bsd:\n' \ 'install_bsd: $(LIB)\n' \
'\tinstall -d $(INSTALL_BASE)/include\n' \ '\tinstall -d $(INSTALL_BASE)/include\n' \
'\tinstall -c -m 644 $(LIB) $(INSTALL_BASE)\n' \ '\tinstall -c -m 644 $(LIB) $(INSTALL_BASE)\n' \
'\tcd rtemsbsd; for i in `find freebsd -name \'*.h\'` ; do \\\n' \ '\tcd rtemsbsd; for i in `find freebsd -name \'*.h\'` ; do \\\n' \