diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-09 18:14:38 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-09 18:14:38 +0000 |
| commit | d7a75734b05154f0a44fe00fbe026027814e0c4e (patch) | |
| tree | 17480d31ac3ae977cf6c494ba20575854066b2d1 | |
| parent | 2004-01-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-d7a75734b05154f0a44fe00fbe026027814e0c4e.tar.bz2 | |
2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/enable-networking.m4: Don't AC_SUBST(RTEMS_HAS_NETWORKING).
* aclocal/check-networking.m4: Don't AC_SUBST(HAS_NETWORKING).
* automake/amcompile.am: Remove $(ARCH).
* wrapup/Makefile.am: Add $(ARCH).
Remove compile.am, lib.am.
Include amcompile.am.
| -rw-r--r-- | cpukit/ChangeLog | 9 | ||||
| -rw-r--r-- | cpukit/aclocal/check-networking.m4 | 1 | ||||
| -rw-r--r-- | cpukit/aclocal/enable-networking.m4 | 1 | ||||
| -rw-r--r-- | cpukit/automake/amcompile.am | 7 | ||||
| -rw-r--r-- | cpukit/wrapup/Makefile.am | 16 |
5 files changed, 23 insertions, 11 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index e415140b67..98fb5dacf0 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,14 @@ 2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/enable-networking.m4: Don't AC_SUBST(RTEMS_HAS_NETWORKING). + * aclocal/check-networking.m4: Don't AC_SUBST(HAS_NETWORKING). + * automake/amcompile.am: Remove $(ARCH). + * wrapup/Makefile.am: Add $(ARCH). + Remove compile.am, lib.am. + Include amcompile.am. + +2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * wrapup/Makefile.am: Use ../*/*$(LIB_VARIANT).a instead of $(ARCH)/lib*.a. diff --git a/cpukit/aclocal/check-networking.m4 b/cpukit/aclocal/check-networking.m4 index 514f61b6fa..289c1b3eb2 100644 --- a/cpukit/aclocal/check-networking.m4 +++ b/cpukit/aclocal/check-networking.m4 @@ -25,5 +25,4 @@ if test "$rtems_cv_HAS_NETWORKING" = "yes"; then else HAS_NETWORKING="no"; fi -AC_SUBST(HAS_NETWORKING)dnl ]) diff --git a/cpukit/aclocal/enable-networking.m4 b/cpukit/aclocal/enable-networking.m4 index 7f3b01365c..00a4b6258c 100644 --- a/cpukit/aclocal/enable-networking.m4 +++ b/cpukit/aclocal/enable-networking.m4 @@ -11,5 +11,4 @@ AC_HELP_STRING([--enable-networking],[enable TCP/IP stack]), no) RTEMS_HAS_NETWORKING=no ;; *) AC_MSG_ERROR(bad value ${enableval} for enable-networking option) ;; esac],[RTEMS_HAS_NETWORKING=yes]) -AC_SUBST(RTEMS_HAS_NETWORKING)dnl ]) diff --git a/cpukit/automake/amcompile.am b/cpukit/automake/amcompile.am index d53d7bfdb1..3a0dc79534 100644 --- a/cpukit/automake/amcompile.am +++ b/cpukit/automake/amcompile.am @@ -48,13 +48,6 @@ VARIANT_debug_V = DEBUG VARIANT_V = $(VARIANT_$(VARIANT)_V) -## Setup the variant build subdirectory -ARCH_OPTIMIZE_V = o-optimize -ARCH_DEBUG_V = o-debug - -ARCH__V = $(ARCH_OPTIMIZE_V) -ARCH = $(ARCH_$(VARIANT_V)_V) - ## Setup the library suffix LIBSUFFIX_OPTIMIZE_V = LIBSUFFIX_DEBUG_V = _g diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index 9497f5cefd..da988688fe 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -3,8 +3,18 @@ ## include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am +include $(top_srcdir)/automake/amcompile.am + +## Setup the variant build subdirectory +ARCH_OPTIMIZE_V = o-optimize +ARCH_DEBUG_V = o-debug + +ARCH__V = $(ARCH_OPTIMIZE_V) +ARCH = $(ARCH_$(VARIANT_V)_V) + +${ARCH}/$(dirstamp): + @$(mkdir_p) $(ARCH) + @: > $(ARCH)/$(dirstamp) project_lib_DATA = $(ARCH)/librtemscpu$(LIB_VARIANT).a @@ -98,6 +108,8 @@ $(ARCH)/librtemscpu$(LIB_VARIANT).a: ${LIBS} rm -f $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel $(RANLIB) $@ +TMPINSTALL_FILES = + all-local: $(TMPINSTALL_FILES) $(PROJECT_LIB)/$(dirstamp): |