diff --git a/c/src/ChangeLog b/c/src/ChangeLog index e43d77b1f4..62f53181ad 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,7 @@ +2003-03-04 Ralf Corsepius + + * wrapup/Makefile.am: Use SRC += instead of make-vars. + 2003-02-11 Ralf Corsepius * configure.ac: AM_INIT_AUTOMAKE([1.7.2]). diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index 37ff467f55..a95ea2b4be 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -9,29 +9,29 @@ include $(top_srcdir)/../../automake/lib.am LIB = $(PROJECT_RELEASE)/lib/librtemsbsp${LIB_VARIANT}.a +SRCS = + +if HAS_LIBBSP +SRCS += ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a +endif + if HAS_NETWORKING -LIBNETWORKING = ../libnetworking/wrapup/$(ARCH)/libnetapps.a +SRCS += ../libnetworking/wrapup/$(ARCH)/libnetapps.a endif if HAS_RDBG -LIBRDBG = $(PROJECT_RELEASE)/lib/librdbg$(LIB_VARIANT).a +SRCS += $(PROJECT_RELEASE)/lib/librdbg$(LIB_VARIANT).a endif -if HAS_LIBBSP -LIBBSP = ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a -endif +SRCS += $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) if LIBCHIP -LIBCHIP = \ - ../libchip/rtc/$(ARCH)/librtcio.a \ - ../libchip/serial/$(ARCH)/libserialio.a \ - $(wildcard $(PROJECT_RELEASE)/lib/libnetchip$(LIB_VARIANT).a) +SRCS += ../libchip/rtc/$(ARCH)/librtcio.a +SRCS += ../libchip/serial/$(ARCH)/libserialio.a +SRCS += $(wildcard $(PROJECT_RELEASE)/lib/libnetchip$(LIB_VARIANT).a) endif -SRCS = $(LIBBSP) $(LIBNETWORKING) $(LIBRDBG) \ - $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \ - $(LIBCHIP) \ - $(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT)) +SRCS += $(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT)) TMPINSTALL_FILES += $(LIB)