Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-08 16:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

2003-12-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* automake/compile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
	* wrapup/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
	* acinclude.m4: Rework RTEMS_CONFIG_SUBDIR.
	* Makefile.am: Reflect changes to RTEMS_CONFIG_SUBDIR.
This commit is contained in:
Ralf Corsepius
2003-12-14 23:00:58 +00:00
parent 6e9460083a
commit e90cff9631
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/ChangeLog
View File

@@ -1,3 +1,10 @@
2003-12-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* automake/compile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
* wrapup/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
* acinclude.m4: Rework RTEMS_CONFIG_SUBDIR.
* Makefile.am: Reflect changes to RTEMS_CONFIG_SUBDIR.
2003-12-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2003-12-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* support/Makefile.am: Pass @RTEMS_BSP@ to AM_CPPFLAGS. * support/Makefile.am: Pass @RTEMS_BSP@ to AM_CPPFLAGS.

22
c/src/acinclude.m4
View File

@@ -5,19 +5,17 @@
# Note: Consider this file a temporary band-aid until a better, more general # Note: Consider this file a temporary band-aid until a better, more general
# subdirectory handling solution is introduced to RTEMS. # subdirectory handling solution is introduced to RTEMS.
AC_DEFUN([RTEMS_SUBCONFIGURE_ARGS_QUOTE],
[
RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args])
])
AC_DEFUN([RTEMS_CONFIG_SUBDIR], AC_DEFUN([RTEMS_CONFIG_SUBDIR],
[ [AC_REQUIRE([RTEMS_SUBCONFIGURE_ARGS_QUOTE])
AC_CONFIG_COMMANDS_POST( if test "$no_recursion" != yes; then
[
if test "$multilib" != "yes"; then
ac_sub_sourcedir=$2 ac_sub_sourcedir=$2
ac_sub_builddir=$1 ac_sub_builddir=$1
if test "$no_recursion" != yes; then
RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args])
ac_sub_configure_args="$ac_sub_configure_args $3"
for ac_subdir in : $ac_sub_sourcedir; do test "x$ac_subdir" = x: && continue for ac_subdir in : $ac_sub_sourcedir; do test "x$ac_subdir" = x: && continue
# Do not complain, so a configure script can configure whichever # Do not complain, so a configure script can configure whichever
@@ -72,9 +70,9 @@ if test "$no_recursion" != yes; then
ac_sub_cache_file=$ac_dots$cache_file ;; ac_sub_cache_file=$ac_dots$cache_file ;;
esac esac
AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir]) AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args $3 --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir])
# The eval makes quoting arguments work. # The eval makes quoting arguments work.
eval $ac_sub_configure $ac_sub_configure_args \ eval $ac_sub_configure $ac_sub_configure_args $3 \
--cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir || --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir ||
AC_MSG_ERROR([$ac_sub_configure failed for $ac_subdir]) AC_MSG_ERROR([$ac_sub_configure failed for $ac_subdir])
fi fi
@@ -82,6 +80,4 @@ if test "$no_recursion" != yes; then
cd $ac_popdir cd $ac_popdir
done done
fi fi
fi
])
]) ])

4
c/src/automake/compile.am
View File

@@ -139,12 +139,12 @@ depend: depend-am
LINK_OBJS = \ LINK_OBJS = \
$(OBJS) \ $(OBJS) \
$(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%$(LIB_VARIANT).rel)
LINK_FILES =\ LINK_FILES =\
$(START_FILE) \ $(START_FILE) \
$(OBJS) \ $(OBJS) \
$(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%$(LIB_VARIANT).rel)
if RTEMS_USE_GCC if RTEMS_USE_GCC
## gcc >= 2.8 ## gcc >= 2.8

4
c/src/wrapup/Makefile.am
View File

@@ -24,7 +24,7 @@ if HAS_RDBG
SRCS += ../librdbg/src/$(RTEMS_CPU)/$(ARCH)/librdbg.a SRCS += ../librdbg/src/$(RTEMS_CPU)/$(ARCH)/librdbg.a
endif endif
SRCS += $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) SRCS += $(wildcard $(PROJECT_LIB)/libcpu$(LIB_VARIANT).a)
if LIBCHIP if LIBCHIP
SRCS += ../libchip/rtc/$(ARCH)/librtcio.a SRCS += ../libchip/rtc/$(ARCH)/librtcio.a
@@ -36,7 +36,7 @@ endif
endif endif
SRCS += $(wildcard \ SRCS += $(wildcard \
$(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT)) $(PROJECT_LIB)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT))
all-local: $(TMPINSTALL_FILES) all-local: $(TMPINSTALL_FILES)