RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* 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.
This commit is contained in:
Ralf Corsepius
2004-01-09 18:14:38 +00:00
parent 3ed23846a7
commit d7a75734b0
5 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cpukit/ChangeLog
View File

@@ -1,3 +1,12 @@
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> 2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Use ../*/*$(LIB_VARIANT).a instead of * wrapup/Makefile.am: Use ../*/*$(LIB_VARIANT).a instead of

1
cpukit/aclocal/check-networking.m4
View File

@@ -25,5 +25,4 @@ if test "$rtems_cv_HAS_NETWORKING" = "yes"; then
else else
HAS_NETWORKING="no"; HAS_NETWORKING="no";
fi fi
AC_SUBST(HAS_NETWORKING)dnl
]) ])

1
cpukit/aclocal/enable-networking.m4
View File

@@ -11,5 +11,4 @@ AC_HELP_STRING([--enable-networking],[enable TCP/IP stack]),
no) RTEMS_HAS_NETWORKING=no ;; no) RTEMS_HAS_NETWORKING=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for enable-networking option) ;; *) AC_MSG_ERROR(bad value ${enableval} for enable-networking option) ;;
esac],[RTEMS_HAS_NETWORKING=yes]) esac],[RTEMS_HAS_NETWORKING=yes])
AC_SUBST(RTEMS_HAS_NETWORKING)dnl
]) ])

7
cpukit/automake/amcompile.am
View File

@@ -48,13 +48,6 @@ VARIANT_debug_V = DEBUG
VARIANT_V = $(VARIANT_$(VARIANT)_V) 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 ## Setup the library suffix
LIBSUFFIX_OPTIMIZE_V = LIBSUFFIX_OPTIMIZE_V =
LIBSUFFIX_DEBUG_V = _g LIBSUFFIX_DEBUG_V = _g

16
cpukit/wrapup/Makefile.am
View File

@@ -3,8 +3,18 @@
## ##
include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/multilib.am
include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/amcompile.am
include $(top_srcdir)/automake/lib.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 project_lib_DATA = $(ARCH)/librtemscpu$(LIB_VARIANT).a
@@ -98,6 +108,8 @@ $(ARCH)/librtemscpu$(LIB_VARIANT).a: ${LIBS}
rm -f $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel rm -f $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
$(RANLIB) $@ $(RANLIB) $@
TMPINSTALL_FILES =
all-local: $(TMPINSTALL_FILES) all-local: $(TMPINSTALL_FILES)
$(PROJECT_LIB)/$(dirstamp): $(PROJECT_LIB)/$(dirstamp):