diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-15 04:08:46 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-15 04:08:46 +0000 |
| commit | ca1531c56c7c3263bcde13533405e909f90bc46f (patch) | |
| tree | e20f3d36925a3261dd89b03eb354659fcb20b87a | |
| parent | 2004-01-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-ca1531c56c7c3263bcde13533405e909f90bc46f.tar.bz2 | |
2004-01-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* support/Makefile.am: Use automake compilation rules.
* wrapup/Makefile.am: Reflect changes to support/*.
| -rw-r--r-- | c/src/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/support/Makefile.am | 16 | ||||
| -rw-r--r-- | c/src/wrapup/Makefile.am | 2 |
3 files changed, 15 insertions, 8 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 65b6d40cbc..ab5cf1715f 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,5 +1,10 @@ 2004-01-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * support/Makefile.am: Use automake compilation rules. + * wrapup/Makefile.am: Reflect changes to support/*. + +2004-01-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * configure.ac: Remove libnetworking/wrapup/Makefile. * wrapup/Makefile.am: Reflect change to libnetworking/*. Use libnetworking/*/lib*.a instead of libnetapps.a diff --git a/c/src/support/Makefile.am b/c/src/support/Makefile.am index 5fa25b44be..10422cc77f 100644 --- a/c/src/support/Makefile.am +++ b/c/src/support/Makefile.am @@ -7,14 +7,16 @@ include $(top_srcdir)/automake/lib.am AM_CPPFLAGS += -DRTEMS_BSP=\"@RTEMS_BSP@\" -C_FILES=version.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +EXTRA_LIBRARIES = libsupport.a +CLEANFILES = libsupport.a +libsupport_a_SOURCES = version.c +libsupport_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -LIB = $(ARCH)/libsupport.a +EXTRA_LIBRARIES += libsupport_g.a +CLEANFILES += libsupport_g.a +libsupport_g_a_SOURCES = $(libsupport_a_SOURCES) +libsupport_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -$(LIB): $(OBJS) - $(make-library) - -all-local: $(LIB) +noinst_DATA = libsupport$(LIB_VARIANT).a include $(top_srcdir)/automake/local.am diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index 9aee6922d8..ea9357ee4d 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -9,7 +9,7 @@ include $(top_srcdir)/automake/lib.am project_lib_DATA = $(ARCH)/librtemsbsp$(LIB_VARIANT).a -SRCS = ../support/${ARCH}/libsupport.a +SRCS = ../support/libsupport$(LIB_VARIANT).a if HAS_LIBBSP SRCS += \ |