diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-23 13:57:02 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-23 13:57:02 +0000 |
| commit | 9f4868cea9c37ff42c0c01dd217c6710a6dda2aa (patch) | |
| tree | ccafc2587352f57c5db8ba8fd924ca1240dfd416 /c/src/libchip | |
| parent | Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-9f4868cea9c37ff42c0c01dd217c6710a6dda2aa.tar.bz2 | |
Miscellaneous patches from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
that are part of the Makefile.am conversion effort but were missed
in the previous commits.
Diffstat (limited to 'c/src/libchip')
| -rw-r--r-- | c/src/libchip/network/Makefile.am | 8 | ||||
| -rw-r--r-- | c/src/libchip/rtc/Makefile.am | 10 | ||||
| -rw-r--r-- | c/src/libchip/serial/Makefile.am | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/c/src/libchip/network/Makefile.am b/c/src/libchip/network/Makefile.am index 52f13482da..674e3c2b56 100644 --- a/c/src/libchip/network/Makefile.am +++ b/c/src/libchip/network/Makefile.am @@ -37,13 +37,13 @@ PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/libchip \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%) -TMPINSTALL_FILES = \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA) +TMPINSTALL_FILES += \ +$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a -$(LIB): $(SRCS) ${OBJS} +$(LIB): ${OBJS} $(make-library) -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA): $(LIB) +$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) $(INSTALL_DATA) $< $@ all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) diff --git a/c/src/libchip/rtc/Makefile.am b/c/src/libchip/rtc/Makefile.am index 4c5b210624..79b73b60af 100644 --- a/c/src/libchip/rtc/Makefile.am +++ b/c/src/libchip/rtc/Makefile.am @@ -19,14 +19,14 @@ SRCS = $(C_FILES) $(H_FILES) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg +include $(top_srcdir)/../../../automake/lib.am PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/libchip \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%) -TMPINSTALL_FILES = \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA) +TMPINSTALL_FILES += \ +$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a $(PROJECT_INCLUDE)/libchip: @$(mkinstalldirs) $@ @@ -39,10 +39,10 @@ $(PROJECT_INCLUDE)/libchip/%.h: %.h AM_CFLAGS += $(LIBC_DEFINES) -$(LIB): $(SRCS) ${OBJS} +$(LIB): ${OBJS} $(make-library) -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA): $(LIB) +$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) $(INSTALL_DATA) $< $@ all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) diff --git a/c/src/libchip/serial/Makefile.am b/c/src/libchip/serial/Makefile.am index 2f4a16f697..6e70ca107c 100644 --- a/c/src/libchip/serial/Makefile.am +++ b/c/src/libchip/serial/Makefile.am @@ -20,14 +20,14 @@ SRCS = $(C_FILES) $(H_FILES) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg +include $(top_srcdir)/../../../automake/lib.am PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/libchip \ $(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/libchip/%) -TMPINSTALL_FILES = \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA) +TMPINSTALL_FILES += \ +$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a $(PROJECT_INCLUDE)/libchip: @$(mkinstalldirs) $@ @@ -40,10 +40,10 @@ $(PROJECT_INCLUDE)/libchip/%.h: %.h AM_CFLAGS += $(LIBC_DEFINES) -$(LIB): $(SRCS) ${OBJS} +$(LIB): ${OBJS} $(make-library) -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA): $(LIB) +$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) $(INSTALL_DATA) $< $@ all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) |