From 0efa9f01f80d98aabc54a87748d60cd19be2416c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 4 Oct 1999 18:53:31 +0000 Subject: Patch from Ralf Corsepius to make fix bug where wrapup left pieces out of the librtemsall.a. --- c/src/configure.in | 2 ++ c/src/exec/libcsupport/Makefile.am | 2 +- c/src/lib/Makefile.am | 2 +- c/src/lib/configure.in | 3 +-- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'c') diff --git a/c/src/configure.in b/c/src/configure.in index d708184bb4..487f6cbc2e 100644 --- a/c/src/configure.in +++ b/c/src/configure.in @@ -33,10 +33,12 @@ if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then cfg_subdirs="$cfg_subdirs librtems++"; fi AC_CONFIG_SUBDIRS($cfg_subdirs) +AC_SUBST(cfg_subdirs) AC_CONFIG_SUBDIRS(tests) RTEMS_PROJECT_ROOT AC_OUTPUT( Makefile +wrapup/Makefile ) diff --git a/c/src/exec/libcsupport/Makefile.am b/c/src/exec/libcsupport/Makefile.am index 0c8524d9c4..f4d3e1afd6 100644 --- a/c/src/exec/libcsupport/Makefile.am +++ b/c/src/exec/libcsupport/Makefile.am @@ -14,7 +14,7 @@ LIBCHIP = libchip endif SUBDIRS = start include libmisc libc libcpu libbsp \ - $(LIBRDBG) $(LIBCHIP) $(LIBHWAPI) wrapup + $(LIBRDBG) $(LIBCHIP) $(LIBHWAPI) include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/Makefile.am b/c/src/lib/Makefile.am index 0c8524d9c4..f4d3e1afd6 100644 --- a/c/src/lib/Makefile.am +++ b/c/src/lib/Makefile.am @@ -14,7 +14,7 @@ LIBCHIP = libchip endif SUBDIRS = start include libmisc libc libcpu libbsp \ - $(LIBRDBG) $(LIBCHIP) $(LIBHWAPI) wrapup + $(LIBRDBG) $(LIBCHIP) $(LIBHWAPI) include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/configure.in b/c/src/lib/configure.in index 5a256c9346..d4d945b0a7 100644 --- a/c/src/lib/configure.in +++ b/c/src/lib/configure.in @@ -97,5 +97,4 @@ include/rdbg/Makefile include/rdbg/i386/Makefile include/rdbg/powerpc/Makefile libc/Makefile -start/Makefile -wrapup/Makefile) +start/Makefile) -- cgit v1.2.3