Makefile: Clean up build and do not use install point

This commit is contained in:
Joel Sherrill 2012-07-13 11:27:44 -05:00
parent e78d6ab1c3
commit 3457ff633c
2 changed files with 13 additions and 7 deletions

View File

@ -11,7 +11,6 @@ CFLAGS += -I rtemsbsd/$(RTEMS_CPU)/include
CFLAGS += -I freebsd/$(RTEMS_CPU)/include CFLAGS += -I freebsd/$(RTEMS_CPU)/include
CFLAGS += -I contrib/altq CFLAGS += -I contrib/altq
CFLAGS += -I contrib/pf CFLAGS += -I contrib/pf
CFLAGS += -B $(INSTALL_BASE)
CFLAGS += -w CFLAGS += -w
CFLAGS += -std=gnu99 CFLAGS += -std=gnu99
CFLAGS += -MT $@ -MD -MP -MF $(basename $@).d CFLAGS += -MT $@ -MD -MP -MF $(basename $@).d
@ -451,7 +450,7 @@ $(LIB): $(C_O_FILES)
lib_bsd: lib_bsd:
$(MAKE) $(LIB) $(MAKE) $(LIB)
lib_user: lib_user: install_bsd
$(MAKE) -C freebsd-userspace $(MAKE) -C freebsd-userspace
CPU_SED = sed CPU_SED = sed
@ -462,15 +461,19 @@ 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) install: lib_bsd install_bsd lib_user install_user
install_bsd:
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 . -name '*.h' | $(CPU_SED)` ; do \ cd rtemsbsd; for i in `find . -name '*.h' | $(CPU_SED)` ; do \
install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
for i in `find freebsd -name '*.h' | $(CPU_SED)` ; do \ for i in `find freebsd -name '*.h' | $(CPU_SED)` ; do \
install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
-cd freebsd/$(RTEMS_CPU)/include && for i in `find . -name '*.h'` ; do \ -cd freebsd/$(RTEMS_CPU)/include ; for i in `find . -name '*.h'` ; do \
install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
install_user:
$(MAKE) -C freebsd-userspace install $(MAKE) -C freebsd-userspace install
clean: clean:

View File

@ -342,7 +342,6 @@ class ModuleManager:
'CFLAGS += -I freebsd/$(RTEMS_CPU)/include \n' \ 'CFLAGS += -I freebsd/$(RTEMS_CPU)/include \n' \
'CFLAGS += -I contrib/altq \n' \ 'CFLAGS += -I contrib/altq \n' \
'CFLAGS += -I contrib/pf \n' \ 'CFLAGS += -I contrib/pf \n' \
'CFLAGS += -B $(INSTALL_BASE) \n' \
'CFLAGS += -w \n' \ 'CFLAGS += -w \n' \
'CFLAGS += -std=gnu99\n' \ 'CFLAGS += -std=gnu99\n' \
'CFLAGS += -MT $@ -MD -MP -MF $(basename $@).d\n' \ 'CFLAGS += -MT $@ -MD -MP -MF $(basename $@).d\n' \
@ -370,7 +369,7 @@ class ModuleManager:
'lib_bsd:\n' \ 'lib_bsd:\n' \
'\t$(MAKE) $(LIB)\n' \ '\t$(MAKE) $(LIB)\n' \
'\n' \ '\n' \
'lib_user:\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' \
@ -381,7 +380,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)\n' \ 'install: lib_bsd install_bsd lib_user install_user\n' \
'\n' \
'install_bsd:\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 . -name \'*.h\' | $(CPU_SED)` ; do \\\n' \ '\tcd rtemsbsd; for i in `find . -name \'*.h\' | $(CPU_SED)` ; do \\\n' \
@ -390,6 +391,8 @@ class ModuleManager:
'\t install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \ '\t install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
'\t-cd freebsd/$(RTEMS_CPU)/include ; for i in `find . -name \'*.h\'` ; do \\\n' \ '\t-cd freebsd/$(RTEMS_CPU)/include ; for i in `find . -name \'*.h\'` ; do \\\n' \
'\t install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \ '\t install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
'\n' \
'install_user:\n' \
'\t$(MAKE) -C freebsd-userspace install\n' \ '\t$(MAKE) -C freebsd-userspace install\n' \
'\n' \ '\n' \
'clean:\n' \ 'clean:\n' \