diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-12-19 05:11:50 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-12-19 05:11:50 +0000 |
| commit | d49b0e232cba2f0c3ce7da52882456d90089fdd6 (patch) | |
| tree | a6efd271c2ef9f13124d6113369949ebbdf3c708 /c/src/librtems++ | |
| parent | 2002-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-d49b0e232cba2f0c3ce7da52882456d90089fdd6.tar.bz2 | |
2002-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Eliminate *_O_FILES.
Use install-data-local instead of bsplist_DATA.
* configure.ac: Require autoconf-2.57/automake-1.7.2.
Apply 4th arg to AC_INIT to prevent autoconf to corrupt package name.
Diffstat (limited to 'c/src/librtems++')
| -rw-r--r-- | c/src/librtems++/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/librtems++/Makefile.am | 9 | ||||
| -rw-r--r-- | c/src/librtems++/configure.ac | 7 |
3 files changed, 14 insertions, 9 deletions
diff --git a/c/src/librtems++/ChangeLog b/c/src/librtems++/ChangeLog index c177c485b7..b3c1ab24eb 100644 --- a/c/src/librtems++/ChangeLog +++ b/c/src/librtems++/ChangeLog @@ -1,3 +1,10 @@ +2002-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Eliminate *_O_FILES. + Use install-data-local instead of bsplist_DATA. + * configure.ac: Require autoconf-2.57/automake-1.7.2. + Apply 4th arg to AC_INIT to prevent autoconf to corrupt package name. + 2002-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * src/Makefile.am: Remove. diff --git a/c/src/librtems++/Makefile.am b/c/src/librtems++/Makefile.am index 527e22c52f..c000f896a0 100644 --- a/c/src/librtems++/Makefile.am +++ b/c/src/librtems++/Makefile.am @@ -30,14 +30,13 @@ LIB = ${ARCH}/librtems++.a CC_FILES = src/rtemsEvent.cc src/rtemsInterrupt.cc src/rtemsMessageQueue.cc \ src/rtemsSemaphore.cc src/rtemsStatusCode.cc src/rtemsTask.cc src/rtemsTimer.cc -CC_O_FILES = $(CC_FILES:src/%.cc=${ARCH}/%.$(OBJEXT)) - -SRCS = $(CC_FILES) -OBJS = $(CC_O_FILES) +OBJS = $(CC_FILES:src/%.cc=${ARCH}/%.$(OBJEXT)) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/librtems++$(LIB_VARIANT).a -bsplib_DATA = $(LIB) +install-data-local: $(LIB) + @$(mkinstalldirs) $(DESTDIR)$(bsplibdir) + $(INSTALL_DATA) $(LIB) $(DESTDIR)$(bsplibdir) ${ARCH}/%.o: src/%.cc test -d $(ARCH) || mkdir $(ARCH) diff --git a/c/src/librtems++/configure.ac b/c/src/librtems++/configure.ac index 73c58bb1ea..2ba7e6bd35 100644 --- a/c/src/librtems++/configure.ac +++ b/c/src/librtems++/configure.ac @@ -2,8 +2,8 @@ ## ## $Id$ -AC_PREREQ(2.52) -AC_INIT([rtems-c-src-librtems++],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) +AC_PREREQ(2.57) +AC_INIT([rtems-c-src-librtems++],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com],[rtems-c-src-librtems++]) AC_CONFIG_SRCDIR([include/rtems++]) RTEMS_TOP(../../..) AC_CONFIG_AUX_DIR(../../..) @@ -11,14 +11,13 @@ AC_CONFIG_AUX_DIR(../../..) RTEMS_CANONICAL_TARGET_CPU RTEMS_CANONICAL_HOST -AM_INIT_AUTOMAKE([no-define foreign 1.6]) +AM_INIT_AUTOMAKE([no-define foreign 1.7.2]) AM_MAINTAINER_MODE RTEMS_ENABLE_CXX RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU -RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_CXX(RTEMS_BSP) ## check for g++ |