diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-07-13 11:27:44 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-07-13 11:27:44 -0500 |
| commit | 3457ff633cea08d2f84a18c67b4247930da16b7a (patch) | |
| tree | c571fb0497f4d079ed93ff4eb5f14734b2d1db89 | |
| parent | MIPS: Remove code with advertising clause (diff) | |
| download | rtems-libbsd-3457ff633cea08d2f84a18c67b4247930da16b7a.tar.bz2 | |
Makefile: Clean up build and do not use install point
| -rw-r--r-- | Makefile | 11 | ||||
| -rwxr-xr-x | freebsd-to-rtems.py | 9 |
2 files changed, 13 insertions, 7 deletions
@@ -11,7 +11,6 @@ CFLAGS += -I rtemsbsd/$(RTEMS_CPU)/include CFLAGS += -I freebsd/$(RTEMS_CPU)/include CFLAGS += -I contrib/altq CFLAGS += -I contrib/pf -CFLAGS += -B $(INSTALL_BASE) CFLAGS += -w CFLAGS += -std=gnu99 CFLAGS += -MT $@ -MD -MP -MF $(basename $@).d @@ -451,7 +450,7 @@ $(LIB): $(C_O_FILES) lib_bsd: $(MAKE) $(LIB) -lib_user: +lib_user: install_bsd $(MAKE) -C freebsd-userspace CPU_SED = sed @@ -462,15 +461,19 @@ CPU_SED += -e '/mips/d' CPU_SED += -e '/sparc/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 -c -m 644 $(LIB) $(INSTALL_BASE) cd rtemsbsd; for i in `find . -name '*.h' | $(CPU_SED)` ; do \ install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done for i in `find freebsd -name '*.h' | $(CPU_SED)` ; do \ 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_user: $(MAKE) -C freebsd-userspace install clean: diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py index 0efe6aa4..9f2b935c 100755 --- a/freebsd-to-rtems.py +++ b/freebsd-to-rtems.py @@ -342,7 +342,6 @@ class ModuleManager: 'CFLAGS += -I freebsd/$(RTEMS_CPU)/include \n' \ 'CFLAGS += -I contrib/altq \n' \ 'CFLAGS += -I contrib/pf \n' \ - 'CFLAGS += -B $(INSTALL_BASE) \n' \ 'CFLAGS += -w \n' \ 'CFLAGS += -std=gnu99\n' \ 'CFLAGS += -MT $@ -MD -MP -MF $(basename $@).d\n' \ @@ -370,7 +369,7 @@ class ModuleManager: 'lib_bsd:\n' \ '\t$(MAKE) $(LIB)\n' \ '\n' \ - 'lib_user:\n' \ + 'lib_user: install_bsd\n' \ '\t$(MAKE) -C freebsd-userspace\n' \ '\n' \ 'CPU_SED = sed\n' \ @@ -381,7 +380,9 @@ class ModuleManager: 'CPU_SED += -e \'/sparc/d\'\n' \ 'CPU_SED += -e \'/sparc64/d\'\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 -c -m 644 $(LIB) $(INSTALL_BASE)\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-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' \ + '\n' \ + 'install_user:\n' \ '\t$(MAKE) -C freebsd-userspace install\n' \ '\n' \ 'clean:\n' \ |