diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-01-06 06:50:41 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-01-06 06:50:41 +0000 |
| commit | c0ceea58f022421d0316691abb05dfd44e6f8c36 (patch) | |
| tree | 539b0c654e93a9de35fca84d437201c430f341fe /c/src/librtems++ | |
| parent | 2005-01-05 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-c0ceea58f022421d0316691abb05dfd44e6f8c36.tar.bz2 | |
2005-01-06 Ralf Corsepius <ralf.corsepius@rtems.org>
* Makefile.am: Remove build-variant support.
Diffstat (limited to 'c/src/librtems++')
| -rw-r--r-- | c/src/librtems++/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/librtems++/Makefile.am | 22 |
2 files changed, 10 insertions, 16 deletions
diff --git a/c/src/librtems++/ChangeLog b/c/src/librtems++/ChangeLog index 40cf123c14..5fbf5d1200 100644 --- a/c/src/librtems++/ChangeLog +++ b/c/src/librtems++/ChangeLog @@ -1,3 +1,7 @@ +2005-01-06 Ralf Corsepius <ralf.corsepius@rtems.org> + + * Makefile.am: Remove build-variant support. + 2004-09-24 Ralf Corsepius <ralf_corsepius@rtems.org> * configure.ac: Require automake > 1.9. diff --git a/c/src/librtems++/Makefile.am b/c/src/librtems++/Makefile.am index cf4c9a895f..3bb798e76a 100644 --- a/c/src/librtems++/Makefile.am +++ b/c/src/librtems++/Makefile.am @@ -6,9 +6,6 @@ ACLOCAL_AMFLAGS = -I ../aclocal include $(top_srcdir)/../automake/compile.am -EXTRA_LIBRARIES = -CLEANFILES = - if HAS_CXX include_rtems__dir = $(includedir)/rtems++ @@ -18,19 +15,12 @@ include_rtems___HEADERS = include/rtems++/rtemsEvent.h \ include/rtems++/rtemsTask.h include/rtems++/rtemsTaskMode.h \ include/rtems++/rtemsTimer.h -EXTRA_LIBRARIES += librtems++.a -CLEANFILES += librtems++.a +project_lib_LIBRARIES = librtems++.a + librtems___a_SOURCES = src/rtemsEvent.cc src/rtemsInterrupt.cc \ src/rtemsMessageQueue.cc src/rtemsSemaphore.cc src/rtemsStatusCode.cc \ src/rtemsTask.cc src/rtemsTimer.cc librtems___a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) - -EXTRA_LIBRARIES += librtems++_g.a -CLEANFILES += librtems++_g.a -librtems___g_a_SOURCES = $(librtems___a_SOURCES) -librtems___g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -project_lib_DATA = librtems++$(LIB_VARIANT).a endif all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -82,12 +72,12 @@ $(PROJECT_INCLUDE)/rtems++/rtemsTimer.h: include/rtems++/rtemsTimer.h $(PROJECT_ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems++/rtemsTimer.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/rtemsTimer.h -$(PROJECT_LIB)/librtems++$(LIB_VARIANT).a: librtems++$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/librtems++$(LIB_VARIANT).a -TMPINSTALL_FILES += $(PROJECT_LIB)/librtems++$(LIB_VARIANT).a +$(PROJECT_LIB)/librtems++.a: librtems++.a $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/librtems++.a +TMPINSTALL_FILES += $(PROJECT_LIB)/librtems++.a endif -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) |