diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-04-01 18:12:07 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-04-01 18:12:07 +0000 |
| commit | 3953cb4d66ab758efdcc0663839e13bd4c2b015f (patch) | |
| tree | da4ad281f1a5d6f750ff443a1316ef5e38748d01 /c/src/make | |
| parent | 2011-04-01 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-3953cb4d66ab758efdcc0663839e13bd4c2b015f.tar.bz2 | |
2011-04-01 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, Makefile.inc.in, configure.ac, target.cfg.in: Update to
account for movement of .cfg files.
Diffstat (limited to 'c/src/make')
| -rw-r--r-- | c/src/make/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/make/Makefile.am | 1 | ||||
| -rw-r--r-- | c/src/make/Makefile.inc.in | 3 | ||||
| -rw-r--r-- | c/src/make/configure.ac | 2 | ||||
| -rw-r--r-- | c/src/make/target.cfg.in | 1 |
5 files changed, 12 insertions, 0 deletions
diff --git a/c/src/make/ChangeLog b/c/src/make/ChangeLog index 0a2551513f..87f5120323 100644 --- a/c/src/make/ChangeLog +++ b/c/src/make/ChangeLog @@ -1,3 +1,8 @@ +2011-04-01 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.am, Makefile.inc.in, configure.ac, target.cfg.in: Update to + account for movement of .cfg files. + 2011-03-29 Ralf Corsépius <ralf.corsepius@rtems.org> * Makefile.am: Use '|' as sed-delimiter. diff --git a/c/src/make/Makefile.am b/c/src/make/Makefile.am index 2ed83a2c47..9d802b1ec8 100644 --- a/c/src/make/Makefile.am +++ b/c/src/make/Makefile.am @@ -40,6 +40,7 @@ CLEANFILES += bsp.cfg target.cfg: target.cfg.in Makefile sed \ + -e "s|[@]RTEMS_API[@]|$(RTEMS_API)|" \ -e "s|[@]CPPFLAGS[@]|$(CPPFLAGS)|" \ -e "s|[@]CFLAGS[@]|$(CFLAGS)|" \ -e "s|[@]LIBS[@]|$(LIBS)|" \ diff --git a/c/src/make/Makefile.inc.in b/c/src/make/Makefile.inc.in index 35c997b65f..bb37676987 100644 --- a/c/src/make/Makefile.inc.in +++ b/c/src/make/Makefile.inc.in @@ -16,6 +16,8 @@ LD_FOR_TARGET = @LD@ SIZE_FOR_TARGET = @SIZE@ OBJCOPY_FOR_TARGET = @OBJCOPY@ +RTEMS_API = @RTEMS_API@ + CC= $(CC_FOR_TARGET) CXX= $(CXX_FOR_TARGET) AS= $(AS_FOR_TARGET) @@ -37,6 +39,7 @@ export OBJCOPY RTEMS_ROOT = $(prefix) PROJECT_ROOT = $(RTEMS_ROOT) RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +RTEMS_SHARE = $(RTEMS_ROOT)/share/rtems$(RTEMS_API) RTEMS_USE_OWN_PDIR = no RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@ diff --git a/c/src/make/configure.ac b/c/src/make/configure.ac index f40ac6a755..dac051376f 100644 --- a/c/src/make/configure.ac +++ b/c/src/make/configure.ac @@ -17,6 +17,7 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.11.1]) AM_MAINTAINER_MODE +RTEMS_VERSIONING RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_POSIX RTEMS_ENABLE_NETWORKING @@ -69,6 +70,7 @@ AC_SUBST(RTEMS_HAS_CPLUSPLUS) AC_SUBST(program_prefix) AC_SUBST(CC_CFLAGS_DEFAULT) AC_SUBST(CC_CFLAGS_DEBUG_V) +AC_SUBST(RTEMS_API,[_RTEMS_API]) cfg_dir="${RTEMS_TOPdir}/make" AC_SUBST(cfg_dir) diff --git a/c/src/make/target.cfg.in b/c/src/make/target.cfg.in index b3fd4e5785..f06a9b4609 100644 --- a/c/src/make/target.cfg.in +++ b/c/src/make/target.cfg.in @@ -9,6 +9,7 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = LIBS = @LIBS@ +RTEMS_API = @RTEMS_API@ CC = @CC@ AS = @AS@ AR = @AR@ |