From 5a550a3b057f27afbf9230ce0d68820ca17131df Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 1 Dec 2003 07:02:50 +0000 Subject: 2003-12-01 Ralf Corsepius * ide/Makefile.am: Use dirstamps for preinstallation. Reformat. * network/Makefile.am: Ditto. * rtc/Makefile.am: Ditto. * serial/Makefile.am: Ditto. --- c/src/libchip/ChangeLog | 7 +++++ c/src/libchip/ide/Makefile.am | 33 +++++++++++++++++------ c/src/libchip/network/Makefile.am | 57 ++++++++++++++++++++++++++++----------- c/src/libchip/rtc/Makefile.am | 32 ++++++++++++++-------- c/src/libchip/serial/Makefile.am | 38 +++++++++++++++++++------- 5 files changed, 124 insertions(+), 43 deletions(-) diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog index 4a1c5186b1..89c0b9cc8c 100644 --- a/c/src/libchip/ChangeLog +++ b/c/src/libchip/ChangeLog @@ -1,3 +1,10 @@ +2003-12-01 Ralf Corsepius + + * ide/Makefile.am: Use dirstamps for preinstallation. Reformat. + * network/Makefile.am: Ditto. + * rtc/Makefile.am: Ditto. + * serial/Makefile.am: Ditto. + 2003-10-21 Ralf Corsepius * network/open_eth.c: Remove #define OPEN_ETH_SUPPORTED (Unused). diff --git a/c/src/libchip/ide/Makefile.am b/c/src/libchip/ide/Makefile.am index af180a4f36..aae44953a0 100644 --- a/c/src/libchip/ide/Makefile.am +++ b/c/src/libchip/ide/Makefile.am @@ -15,14 +15,6 @@ OBJS = $(C_O_FILES) include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/lib.am -PREINSTALL_FILES = $(PROJECT_INCLUDE)/libchip \ - $(include_ide_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%) - -$(PROJECT_INCLUDE)/libchip: - @$(mkinstalldirs) $@ -$(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 @@ -35,5 +27,30 @@ endif EXTRA_DIST = $(C_FILES) +PREINSTALL_FILES = + +if LIBCHIP +$(PROJECT_INCLUDE)/libchip/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip + @: > $(PROJECT_INCLUDE)/libchip/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/$(dirstamp) + +$(PROJECT_INCLUDE)/libchip/ata.h: ata.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ata.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ata.h + +$(PROJECT_INCLUDE)/libchip/ide_ctrl_cfg.h: ide_ctrl_cfg.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ide_ctrl_cfg.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ide_ctrl_cfg.h + +$(PROJECT_INCLUDE)/libchip/ide_ctrl.h: ide_ctrl.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ide_ctrl.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ide_ctrl.h + +$(PROJECT_INCLUDE)/libchip/ide_ctrl_io.h: ide_ctrl_io.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ide_ctrl_io.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ide_ctrl_io.h +endif + include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/c/src/libchip/network/Makefile.am b/c/src/libchip/network/Makefile.am index 79f6c3cca1..bc8d15f276 100644 --- a/c/src/libchip/network/Makefile.am +++ b/c/src/libchip/network/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - LIBNAME = libnetchip LIB = $(ARCH)/$(LIBNAME).a @@ -12,11 +11,6 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/lib.am -$(PROJECT_INCLUDE)/libchip: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/libchip/%.h: %.h - $(INSTALL_DATA) $< $@ - # # Add local stuff here using += # @@ -25,8 +19,8 @@ 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 open_eth.h +include_libchip_HEADERS = cs8900.h i82586var.h if_fxpvar.h sonic.h \ + if_media.h mii.h open_eth.h $(LIB): $(OBJS) $(make-library) @@ -34,11 +28,6 @@ $(LIB): $(OBJS) $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) $(INSTALL_DATA) $< $@ -if HAS_NETWORKING -PREINSTALL_FILES = $(PROJECT_INCLUDE)/libchip \ - $(include_libchip_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%) -endif - TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a if HAS_NETWORKING @@ -49,7 +38,45 @@ endif .PRECIOUS: $(LIB) EXTRA_DIST = README README.cs8900 README.dec21140 README.i82586 \ - README.open_eth README.sonic cs8900.c cs8900.c.bsp dec21140.c \ - i82586.c if_fxp.c open_eth.c sonic.c + README.open_eth README.sonic cs8900.c cs8900.c.bsp dec21140.c i82586.c \ + if_fxp.c open_eth.c sonic.c + +PREINSTALL_FILES = + +if LIBCHIP +$(PROJECT_INCLUDE)/libchip/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip + @: > $(PROJECT_INCLUDE)/libchip/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/$(dirstamp) + +$(PROJECT_INCLUDE)/libchip/cs8900.h: cs8900.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/cs8900.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/cs8900.h + +$(PROJECT_INCLUDE)/libchip/i82586var.h: i82586var.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/i82586var.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/i82586var.h + +$(PROJECT_INCLUDE)/libchip/if_fxpvar.h: if_fxpvar.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/if_fxpvar.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/if_fxpvar.h + +$(PROJECT_INCLUDE)/libchip/sonic.h: sonic.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/sonic.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/sonic.h + +$(PROJECT_INCLUDE)/libchip/if_media.h: if_media.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/if_media.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/if_media.h + +$(PROJECT_INCLUDE)/libchip/mii.h: mii.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/mii.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mii.h + +$(PROJECT_INCLUDE)/libchip/open_eth.h: open_eth.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/open_eth.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/open_eth.h + +endif include $(top_srcdir)/automake/local.am diff --git a/c/src/libchip/rtc/Makefile.am b/c/src/libchip/rtc/Makefile.am index f2c1544b01..63ca309fde 100644 --- a/c/src/libchip/rtc/Makefile.am +++ b/c/src/libchip/rtc/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - LIBNAME = librtcio LIB = $(ARCH)/$(LIBNAME).a @@ -12,19 +11,9 @@ C_FILES = rtcprobe.c icm7170.c icm7170_reg.c icm7170_reg2.c icm7170_reg4.c \ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/lib.am - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/libchip \ - $(include_libchip_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%) - -$(PROJECT_INCLUDE)/libchip: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/libchip/%.h: %.h - $(INSTALL_DATA) $< $@ - # # Add local stuff here using += # @@ -42,4 +31,25 @@ DOC_FILES = README.ds1643 README.icm7170 README.m48t08 README.m48t18 STATUS EXTRA_DIST = $(C_FILES) $(DOC_FILES) +PREINSTALL_FILES = + +if LIBCHIP +$(PROJECT_INCLUDE)/libchip/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip + @: > $(PROJECT_INCLUDE)/libchip/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/$(dirstamp) + +$(PROJECT_INCLUDE)/libchip/rtc.h: rtc.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/rtc.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/rtc.h + +$(PROJECT_INCLUDE)/libchip/icm7170.h: icm7170.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/icm7170.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/icm7170.h + +$(PROJECT_INCLUDE)/libchip/m48t08.h: m48t08.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/m48t08.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/m48t08.h +endif + include $(top_srcdir)/automake/local.am diff --git a/c/src/libchip/serial/Makefile.am b/c/src/libchip/serial/Makefile.am index 226a01d795..4c78cbbc74 100644 --- a/c/src/libchip/serial/Makefile.am +++ b/c/src/libchip/serial/Makefile.am @@ -2,7 +2,6 @@ # $Id$ # - LIBNAME = libserialio LIB = $(ARCH)/$(LIBNAME).a @@ -16,14 +15,6 @@ noinst_HEADERS = mc68681_p.h ns16550_p.h z85c30_p.h include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/lib.am -PREINSTALL_FILES = $(PROJECT_INCLUDE)/libchip \ - $(include_libchip_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%) - -$(PROJECT_INCLUDE)/libchip: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/libchip/%.h: %.h - $(INSTALL_DATA) $< $@ - # # Add local stuff here using += # @@ -42,4 +33,33 @@ DOC_FILES = README.mc68681 README.ns16550 README.xr88681 README.z85c30 \ EXTRA_DIST = $(C_FILES) $(DOC_FILES) +PREINSTALL_FILES = + +if LIBCHIP +$(PROJECT_INCLUDE)/libchip/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip + @: > $(PROJECT_INCLUDE)/libchip/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/$(dirstamp) + +$(PROJECT_INCLUDE)/libchip/mc68681.h: mc68681.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/mc68681.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mc68681.h + +$(PROJECT_INCLUDE)/libchip/ns16550.h: ns16550.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ns16550.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ns16550.h + +$(PROJECT_INCLUDE)/libchip/z85c30.h: z85c30.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/z85c30.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/z85c30.h + +$(PROJECT_INCLUDE)/libchip/serial.h: serial.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/serial.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/serial.h + +$(PROJECT_INCLUDE)/libchip/sersupp.h: sersupp.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/sersupp.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/sersupp.h +endif + include $(top_srcdir)/automake/local.am -- cgit v1.2.3