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

2004-02-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* libchip/Makefile.am, librdbg/Makefile.am, optman/Makefile.am:
	Preinstall dirs.
	* wrapup/Makefile.am: Preinstall dirs. Cosmetics.
	* aclocal/check-multiprocessing.m4: Cosmetics.
	* aclocal/env-rtemsbsp.m4: Remove RTEMS_ROOT.
	* aclocal/project-root.m4: Remove obsolete comments. Remove PACKHEX.
This commit is contained in:
Ralf Corsepius
2004-02-19 06:08:15 +00:00
parent c98c9c9dd8
commit 5e5cf07b36
8 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
c/src/ChangeLog
View File

@@ -1,3 +1,12 @@
2004-02-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* libchip/Makefile.am, librdbg/Makefile.am, optman/Makefile.am:
Preinstall dirs.
* wrapup/Makefile.am: Preinstall dirs. Cosmetics.
* aclocal/check-multiprocessing.m4: Cosmetics.
* aclocal/env-rtemsbsp.m4: Remove RTEMS_ROOT.
* aclocal/project-root.m4: Remove obsolete comments. Remove PACKHEX.
2004-02-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* librdbg/Makefile.am: Merge-in librdbg/include/Makefile.am,

2
c/src/aclocal/check-multiprocessing.m4
View File

@@ -37,5 +37,5 @@ AC_MSG_ERROR([multiprocessing requested but not supported])
fi
],[rtems_cv_HAS_MP="no";])
AM_CONDITIONAL(HAS_MP,[test "$rtems_cv_HAS_MP" = "yes"])
AM_CONDITIONAL(HAS_MP,[test x"$rtems_cv_HAS_MP" = x"yes"])
])

3
c/src/aclocal/env-rtemsbsp.m4
View File

@@ -33,9 +33,6 @@ AC_SUBST(RTEMS_BSP_SPECS)
GCC_SPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/"
AC_SUBST(GCC_SPECS)
RTEMS_ROOT="\$(PROJECT_ROOT)/c/$RTEMS_BSP"
AC_SUBST(RTEMS_ROOT)
RTEMS_ENABLE_BARE
AC_SUBST(BARE_CPU_MODEL)
AC_SUBST(BARE_CPU_CFLAGS)

13
c/src/aclocal/project-root.m4
View File

@@ -2,21 +2,8 @@ dnl
dnl $Id$
dnl
dnl
dnl PROJECT_TOPdir .. relative path to the top of the build-tree
dnl PROJECT_ROOT .. relative path to the top of the temporary
dnl installation directory inside the build-tree
dnl RTEMS_TOPdir .. relative path of a subpackage's configure.in to the
dnl toplevel configure.in of the source-tree
dnl RTEMS_ROOT .. path to the top of a bsp's build directory
dnl [Applied by custom/*.cfg, depredicated otherwise]
dnl
AC_DEFUN([RTEMS_PROJECT_ROOT],
[dnl
AC_REQUIRE([RTEMS_TOP])
PACKHEX="\$(PROJECT_TOPdir)/tools/build/packhex"
AC_SUBST(PACKHEX)
])

2
c/src/libchip/Makefile.am
View File

@@ -152,7 +152,7 @@ PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
$(PROJECT_LIB)/$(dirstamp):
@$(mkdir_p) $(PROJECT_LIB)
@: > $(PROJECT_LIB)/$(dirstamp)
TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
if LIBCHIP
$(PROJECT_INCLUDE)/libchip/$(dirstamp):

2
c/src/librdbg/Makefile.am
View File

@@ -193,7 +193,7 @@ TMPINSTALL_FILES =
$(PROJECT_LIB)/$(dirstamp):
@$(mkdir_p) $(PROJECT_LIB)
@: > $(PROJECT_LIB)/$(dirstamp)
TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
if HAS_RDBG
$(PROJECT_INCLUDE)/rdbg/$(dirstamp):

3
c/src/optman/Makefile.am
View File

@@ -183,7 +183,7 @@ TMPINSTALL_FILES =
$(PROJECT_LIB)/$(dirstamp):
@$(mkdir_p) $(PROJECT_LIB)
@: > $(PROJECT_LIB)/$(dirstamp)
TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
$(PROJECT_LIB)/no-ext$(LIB_VARIANT).rel: no-ext$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/no-ext$(LIB_VARIANT).rel
@@ -233,6 +233,7 @@ $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel: no-timer$(LIB_VARIANT).rel $(PROJECT_
$(INSTALL_DATA) $< $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel
TMPINSTALL_FILES += $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel
DISTCLEANFILES = $(PREINSTALL_DIRS)
CLEANFILES += $(TMPINSTALL_FILES)
include $(top_srcdir)/automake/local.am

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

@@ -9,7 +9,7 @@ include $(top_srcdir)/automake/compile.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)
@@ -24,8 +24,7 @@ if HAS_WRAPUP_LIBBSP
SRCS += \
../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a
else
SRCS += \
../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/libbsp$(LIB_VARIANT).a
SRCS += ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/libbsp$(LIB_VARIANT).a
endif
endif
@@ -98,12 +97,13 @@ TMPINSTALL_FILES =
$(PROJECT_LIB)/$(dirstamp):
@$(mkdir_p) $(PROJECT_LIB)
@: > $(PROJECT_LIB)/$(dirstamp)
TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
$(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a: $(ARCH)/librtemsbsp$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a
TMPINSTALL_FILES += $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a
DISTCLEANFILES = $(PREINSTALL_DIRS)
CLEANFILES += $(TMPINSTALL_FILES)
include $(top_srcdir)/automake/local.am