From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jun 2000 15:00:15 +0000 Subject: Merged from 4.5.0-beta3a --- c/src/libchip/serial/Makefile.am | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'c/src/libchip/serial/Makefile.am') diff --git a/c/src/libchip/serial/Makefile.am b/c/src/libchip/serial/Makefile.am index 3e860df828..1333ea22d7 100644 --- a/c/src/libchip/serial/Makefile.am +++ b/c/src/libchip/serial/Makefile.am @@ -8,8 +8,8 @@ LIBNAME = libserialio LIB = ${ARCH}/${LIBNAME}.a C_FILES = mc68681.c mc68681_baud.c mc68681_reg.c mc68681_reg2.c \ - mc68681_reg4.c mc68681_reg8.c ns16550.c z85c30.c z85c30_reg.c \ - serprobe.c termios_baud2index.c termios_baud2num.c + mc68681_reg4.c mc68681_reg8.c ns16550.c z85c30.c z85c30_reg.c serprobe.c \ + termios_baud2index.c termios_baud2num.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = mc68681_p.h ns16550_p.h sersupp.h z85c30_p.h @@ -21,12 +21,10 @@ OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/lib.am -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/libchip \ -$(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/libchip/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip \ + $(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/libchip/%) -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a $(PROJECT_INCLUDE)/libchip: @$(mkinstalldirs) $@ @@ -45,10 +43,10 @@ $(LIB): ${OBJS} $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) $(INSTALL_DATA) $< $@ -all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) +all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) -DOC_FILES = \ -README.mc68681 README.ns16550 README.xr88681 README.z85c30 STATUS +DOC_FILES = README.mc68681 README.ns16550 README.xr88681 README.z85c30 \ + STATUS EXTRA_DIST = $(C_FILES) $(DOC_FILES) -- cgit v1.2.3