diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-13 05:25:41 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-13 05:25:41 +0000 |
| commit | b94661383ba5adfcf5e2033d3a3c7b6930d1358e (patch) | |
| tree | 23b28d5f677128d5aebee36cea8bbbb0f87116a3 /c | |
| parent | 2003-12-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-b94661383ba5adfcf5e2033d3a3c7b6930d1358e.tar.bz2 | |
2003-12-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/env-rtemsbsp.m4: Add PROJECT_LIB.
* wrapup/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/aclocal/env-rtemsbsp.m4 | 1 | ||||
| -rw-r--r-- | c/src/wrapup/Makefile.am | 12 |
3 files changed, 12 insertions, 6 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 5a8e5a35b9..76b3fdcc8e 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,8 @@ +2003-12-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * aclocal/env-rtemsbsp.m4: Add PROJECT_LIB. + * wrapup/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. + 2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * wrapup/Makefile.am: Use mkdir_p. Remove dirs from diff --git a/c/src/aclocal/env-rtemsbsp.m4 b/c/src/aclocal/env-rtemsbsp.m4 index 7b61f5702c..3fe9195ddd 100644 --- a/c/src/aclocal/env-rtemsbsp.m4 +++ b/c/src/aclocal/env-rtemsbsp.m4 @@ -46,6 +46,7 @@ includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include" libdir="\${exec_prefix}/${RTEMS_BSP}/lib" AC_SUBST([PROJECT_INCLUDE],["\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"]) +AC_SUBST([PROJECT_LIB],["\$(PROJECT_ROOT)/$RTEMS_BSP/lib"]) AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)/$RTEMS_BSP"]) AC_SUBST([project_libdir],["\$(libdir)"]) diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index 14b60a1184..b8c9bec525 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -68,12 +68,12 @@ $(ARCH)/librtemsbsp$(LIB_VARIANT).a: $(SRCS) $(ARCH)/$(dirstamp) $(AR) rc $@ $(ARCH)/* $(RANLIB) $@ -${PROJECT_RELEASE}/lib/$(dirstamp): - @$(mkdir_p) ${PROJECT_RELEASE}/lib - @: > ${PROJECT_RELEASE}/lib/$(dirstamp) +$(PROJECT_LIB)/$(dirstamp): + @$(mkdir_p) $(PROJECT_LIB) + @: > $(PROJECT_LIB)/$(dirstamp) -${PROJECT_RELEASE}/lib/librtemsbsp$(LIB_VARIANT).a: $(ARCH)/librtemsbsp$(LIB_VARIANT).a ${PROJECT_RELEASE}/lib/$(dirstamp) - $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/librtemsbsp$(LIB_VARIANT).a -TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/librtemsbsp$(LIB_VARIANT).a +$(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a: $(ARCH)/librtemsbsp$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a +TMPINSTALL_FILES += $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a include $(top_srcdir)/automake/local.am |