From d3795e3ea46cc288b973e170ad9027180260a933 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 5 Feb 2001 18:24:37 +0000 Subject: 2001-02-03 Ralf Corsepius * network/Makefile.am, rtc/Makefile.am, serial/Makefile.am: Apply include_*HEADERS instead of H_FILES, replace ${..} with $(..). --- c/src/libchip/ChangeLog | 5 +++++ c/src/libchip/network/Makefile.am | 8 +++++--- c/src/libchip/rtc/Makefile.am | 15 ++++++++------- c/src/libchip/serial/Makefile.am | 17 +++++++++-------- 4 files changed, 27 insertions(+), 18 deletions(-) (limited to 'c/src') diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog index 8010566c46..91b7d67b7a 100644 --- a/c/src/libchip/ChangeLog +++ b/c/src/libchip/ChangeLog @@ -1,3 +1,8 @@ +2001-02-03 Ralf Corsepius + + * network/Makefile.am, rtc/Makefile.am, serial/Makefile.am: + Apply include_*HEADERS instead of H_FILES, replace ${..} with $(..). + 2000-11-13 Jiri Gaisler * network/sonic.c: Added ipalign() routine to align the diff --git a/c/src/libchip/network/Makefile.am b/c/src/libchip/network/Makefile.am index 026fe446c7..68adba9e43 100644 --- a/c/src/libchip/network/Makefile.am +++ b/c/src/libchip/network/Makefile.am @@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = foreign 1.4 +include_libchipdir = $(includedir)/libchip + LIBNAME = libnetchip LIB = $(ARCH)/$(LIBNAME).a @@ -11,7 +13,7 @@ LIB = $(ARCH)/$(LIBNAME).a C_FILES = dec21140.c sonic.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = cs8900.h sonic.h +include_libchip_HEADERS = cs8900.h sonic.h OBJS = $(C_O_FILES) @@ -39,7 +41,7 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) if HAS_NETWORKING PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip \ - $(PROJECT_INCLUDE)/libchip/cs8900.h $(PROJECT_INCLUDE)/libchip/sonic.h + $(include_libchip_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%) endif TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a @@ -51,6 +53,6 @@ endif .PRECIOUS: $(LIB) EXTRA_DIST = README README.cs8900 README.dec21140 README.sonic \ - cs8900.c cs8900.h dec21140.c sonic.c sonic.h + cs8900.c dec21140.c sonic.c include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/libchip/rtc/Makefile.am b/c/src/libchip/rtc/Makefile.am index 2a5f8a50ec..9198ee3491 100644 --- a/c/src/libchip/rtc/Makefile.am +++ b/c/src/libchip/rtc/Makefile.am @@ -4,17 +4,18 @@ AUTOMAKE_OPTIONS = foreign 1.4 +include_libchipdir = $(includedir)/libchip + LIBNAME = librtcio -LIB = ${ARCH}/${LIBNAME}.a +LIB = $(ARCH)/$(LIBNAME).a C_FILES = rtcprobe.c icm7170.c icm7170_reg.c icm7170_reg2.c icm7170_reg4.c \ icm7170_reg8.c m48t08.c m48t08_reg.c m48t08_reg2.c m48t08_reg4.c \ m48t08_reg8.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = rtc.h icm7170.h m48t08.h -noinst_HEADERS = $(H_FILES) +include_libchip_HEADERS = rtc.h icm7170.h m48t08.h OBJS = $(C_O_FILES) @@ -23,7 +24,7 @@ include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip \ - $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%) + $(include_libchip_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a @@ -38,13 +39,13 @@ $(PROJECT_INCLUDE)/libchip/%.h: %.h AM_CFLAGS += $(LIBC_DEFINES) -$(LIB): ${OBJS} +$(LIB): $(OBJS) $(make-library) $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) $(INSTALL_DATA) $< $@ -all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(PREINSTALL_FILES) $(TMPINSTALL_FILES) DOC_FILES = README.ds1643 README.icm7170 README.m48t08 README.m48t18 STATUS diff --git a/c/src/libchip/serial/Makefile.am b/c/src/libchip/serial/Makefile.am index d9acc9f569..b8341571e8 100644 --- a/c/src/libchip/serial/Makefile.am +++ b/c/src/libchip/serial/Makefile.am @@ -4,17 +4,18 @@ AUTOMAKE_OPTIONS = foreign 1.4 +include_libchipdir = $(includedir)/libchip + LIBNAME = libserialio -LIB = ${ARCH}/${LIBNAME}.a +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 -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = mc68681_p.h ns16550_p.h sersupp.h z85c30_p.h -INSTALLED_H_FILES = mc68681.h ns16550.h z85c30.h serial.h -noinst_HEADERS = $(H_FILES) $(INSTALLED_H_FILES) +noinst_HEADERS = mc68681_p.h ns16550_p.h sersupp.h z85c30_p.h +include_libchip_HEADERS = mc68681.h ns16550.h z85c30.h serial.h OBJS = $(C_O_FILES) @@ -23,7 +24,7 @@ include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip \ - $(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/libchip/%) + $(include_libchip_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a @@ -38,13 +39,13 @@ $(PROJECT_INCLUDE)/libchip/%.h: %.h AM_CFLAGS += $(LIBC_DEFINES) -$(LIB): ${OBJS} +$(LIB): $(OBJS) $(make-library) $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) $(INSTALL_DATA) $< $@ -all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(PREINSTALL_FILES) $(TMPINSTALL_FILES) DOC_FILES = README.mc68681 README.ns16550 README.xr88681 README.z85c30 \ STATUS -- cgit v1.2.3