From c7ff624cffbb9c9b3c5161ee828f3f00efd2d326 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 25 Jul 2003 06:35:06 +0000 Subject: 2003-07-25 Ralf Corsepius * ide/Makefile.am, network/Makefile.am, rtc/Makefile.am, serial/Makefile.am: Add conditional LIBCHIP. Conditionally build include-dirs. --- c/src/libchip/ChangeLog | 6 ++++++ c/src/libchip/ide/Makefile.am | 10 +++++----- c/src/libchip/network/Makefile.am | 9 +++++---- c/src/libchip/rtc/Makefile.am | 8 +++++--- c/src/libchip/serial/Makefile.am | 7 ++++--- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog index 942e218ee8..f0953bd8d4 100644 --- a/c/src/libchip/ChangeLog +++ b/c/src/libchip/ChangeLog @@ -1,3 +1,9 @@ +2003-07-25 Ralf Corsepius + + * ide/Makefile.am, network/Makefile.am, rtc/Makefile.am, + serial/Makefile.am: Add conditional LIBCHIP. + Conditionally build include-dirs. + 2003-07-25 Ralf Corsepius * network/if_fxp.c: Replace deprecated b* funcs by mem* funcs. diff --git a/c/src/libchip/ide/Makefile.am b/c/src/libchip/ide/Makefile.am index 566a98cb1b..4289eb3777 100644 --- a/c/src/libchip/ide/Makefile.am +++ b/c/src/libchip/ide/Makefile.am @@ -2,9 +2,6 @@ ## $Id$ ## - -include_idedir = $(includedir)/libchip - LIBNAME = libide LIB = $(ARCH)/$(LIBNAME).a @@ -13,8 +10,6 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) noinst_HEADERS = ata_internal.h -include_ide_HEADERS = ata.h ide_ctrl_cfg.h ide_ctrl.h ide_ctrl_io.h - OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg @@ -29,10 +24,15 @@ $(PROJECT_INCLUDE)/libchip: $(PROJECT_INCLUDE)/libchip/%.h: %.h $(INSTALL_DATA) $< $@ +if LIBCHIP +include_idedir = $(includedir)/libchip +include_ide_HEADERS = ata.h ide_ctrl_cfg.h ide_ctrl.h ide_ctrl_io.h + $(LIB): $(OBJS) $(make-library) all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) +endif EXTRA_DIST = $(C_FILES) diff --git a/c/src/libchip/network/Makefile.am b/c/src/libchip/network/Makefile.am index e6a170a1e3..eafa47b6b2 100644 --- a/c/src/libchip/network/Makefile.am +++ b/c/src/libchip/network/Makefile.am @@ -3,16 +3,12 @@ ## -include_libchipdir = $(includedir)/libchip - LIBNAME = libnetchip LIB = $(ARCH)/$(LIBNAME).a C_FILES = cs8900.c dec21140.c i82586.c sonic.c if_fxp.c elnk.c OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -include_libchip_HEADERS = cs8900.h i82586var.h if_fxpvar.h sonic.h if_media.h mii.h - include $(top_srcdir)/../../automake/compile.am include $(top_srcdir)/../../automake/lib.am @@ -27,6 +23,10 @@ $(PROJECT_INCLUDE)/libchip/%.h: %.h AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ +if LIBCHIP +include_libchipdir = $(includedir)/libchip +include_libchip_HEADERS = cs8900.h i82586var.h if_fxpvar.h sonic.h if_media.h mii.h + $(LIB): $(OBJS) $(make-library) @@ -43,6 +43,7 @@ TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a if HAS_NETWORKING all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) $(TMPINSTALL_FILES) endif +endif .PRECIOUS: $(LIB) diff --git a/c/src/libchip/rtc/Makefile.am b/c/src/libchip/rtc/Makefile.am index 09ba595c28..2e59036faf 100644 --- a/c/src/libchip/rtc/Makefile.am +++ b/c/src/libchip/rtc/Makefile.am @@ -3,8 +3,6 @@ ## -include_libchipdir = $(includedir)/libchip - LIBNAME = librtcio LIB = $(ARCH)/$(LIBNAME).a @@ -14,11 +12,11 @@ C_FILES = rtcprobe.c icm7170.c icm7170_reg.c icm7170_reg2.c icm7170_reg4.c \ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -include_libchip_HEADERS = rtc.h icm7170.h m48t08.h include $(top_srcdir)/../../automake/compile.am include $(top_srcdir)/../../automake/lib.am + PREINSTALL_FILES = $(PROJECT_INCLUDE)/libchip \ $(include_libchip_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%) @@ -30,11 +28,15 @@ $(PROJECT_INCLUDE)/libchip/%.h: %.h # # Add local stuff here using += # +if LIBCHIP +include_libchipdir = $(includedir)/libchip +include_libchip_HEADERS = rtc.h icm7170.h m48t08.h $(LIB): $(OBJS) $(make-library) all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) +endif 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 1d8ef3f130..132e002e41 100644 --- a/c/src/libchip/serial/Makefile.am +++ b/c/src/libchip/serial/Makefile.am @@ -3,8 +3,6 @@ # -include_libchipdir = $(includedir)/libchip - LIBNAME = libserialio LIB = $(ARCH)/$(LIBNAME).a @@ -14,7 +12,6 @@ C_FILES = mc68681.c mc68681_baud.c mc68681_reg.c mc68681_reg2.c \ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) noinst_HEADERS = mc68681_p.h ns16550_p.h z85c30_p.h -include_libchip_HEADERS = mc68681.h ns16550.h z85c30.h serial.h sersupp.h include $(top_srcdir)/../../automake/compile.am include $(top_srcdir)/../../automake/lib.am @@ -30,11 +27,15 @@ $(PROJECT_INCLUDE)/libchip/%.h: %.h # # Add local stuff here using += # +if LIBCHIP +include_libchipdir = $(includedir)/libchip +include_libchip_HEADERS = mc68681.h ns16550.h z85c30.h serial.h sersupp.h $(LIB): $(OBJS) $(make-library) all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) +endif DOC_FILES = README.mc68681 README.ns16550 README.xr88681 README.z85c30 \ STATUS -- cgit v1.2.3