diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-13 09:31:17 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-13 09:31:17 +0000 |
| commit | b72358055c2414898e1a416b2a96a34889e835e2 (patch) | |
| tree | 9a4dc737e1034d3008bf8c3113e5128786349e6c /cpukit | |
| parent | 2003-12-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-b72358055c2414898e1a416b2a96a34889e835e2.tar.bz2 | |
2003-12-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/env-rtemscpu.m4: Remove stray '/' in PROJECT_LIB.
* wrapup/Makefile.am: Remove duplicate $(PROJECT_LIB) rule.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/aclocal/env-rtemscpu.m4 | 2 | ||||
| -rw-r--r-- | cpukit/wrapup/Makefile.am | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index e59c6a6aab..f8f093fac8 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2003-12-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/env-rtemscpu.m4: Remove stray '/' in PROJECT_LIB. + * wrapup/Makefile.am: Remove duplicate $(PROJECT_LIB) rule. + +2003-12-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/env-rtemscpu.m4: Add PROJECT_LIB. * wrapup/Makefile.am: Use $(PROJECT_LIB) instead of ${PROJECT_RELEASE}/lib. diff --git a/cpukit/aclocal/env-rtemscpu.m4 b/cpukit/aclocal/env-rtemscpu.m4 index 759b19879c..6bcc48e28e 100644 --- a/cpukit/aclocal/env-rtemscpu.m4 +++ b/cpukit/aclocal/env-rtemscpu.m4 @@ -15,7 +15,7 @@ AC_DEFUN([RTEMS_ENV_RTEMSCPU], AC_SUBST(MULTISUBDIR) AC_SUBST([PROJECT_INCLUDE],["\$(PROJECT_ROOT)/lib/include"]) - AC_SUBST([PROJECT_LIB],["\$(PROJECT_ROOT)/lib/\$(MULTISUBDIR)"]) + AC_SUBST([PROJECT_LIB],["\$(PROJECT_ROOT)/lib\$(MULTISUBDIR)"]) AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)"]) includedir="\${exec_prefix}/include" diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index a77c3c0ef3..0613aca3f0 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -100,13 +100,6 @@ $(ARCH)/librtemscpu$(LIB_VARIANT).a: ${LIBS} all-local: $(TMPINSTALL_FILES) -${PROJECT_LIB}/$(dirstamp): - @$(mkdir_p) ${PROJECT_LIB} - @: > ${PROJECT_LIB}/$(dirstamp) - -${PROJECT_LIB}/librtemscpu$(LIB_VARIANT).a: $(ARCH)/librtemscpu$(LIB_VARIANT).a ${PROJECT_LIB}/$(dirstamp) - $(INSTALL_DATA) $< ${PROJECT_LIB}/librtemscpu$(LIB_VARIANT).a - $(PROJECT_LIB)/$(dirstamp): @$(mkdir_p) $(PROJECT_LIB) @: > $(PROJECT_LIB)/$(dirstamp) |