From fcc61f1059895fc3a87d776809600fc441f3eaf4 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 2 Dec 2003 07:48:54 +0000 Subject: 2003-12-02 Ralf Corsepius * ide/Makefile.am, network/Makefile.am, rtc/Makefile.am, serial/Makefile.am: Remove. * Makefile.am: Merge-in Makefile.am above. Add preinstallation + compilation dirstamp support. --- c/src/libchip/ChangeLog | 7 ++ c/src/libchip/Makefile.am | 228 +++++++++++++++++++++++++++++++++++++- c/src/libchip/ide/Makefile.am | 56 ---------- c/src/libchip/network/Makefile.am | 82 -------------- c/src/libchip/rtc/Makefile.am | 55 --------- c/src/libchip/serial/Makefile.am | 65 ----------- 6 files changed, 233 insertions(+), 260 deletions(-) delete mode 100644 c/src/libchip/ide/Makefile.am delete mode 100644 c/src/libchip/network/Makefile.am delete mode 100644 c/src/libchip/rtc/Makefile.am delete mode 100644 c/src/libchip/serial/Makefile.am (limited to 'c/src') diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog index 657e57a7a6..4ce91db2e7 100644 --- a/c/src/libchip/ChangeLog +++ b/c/src/libchip/ChangeLog @@ -1,3 +1,10 @@ +2003-12-02 Ralf Corsepius + + * ide/Makefile.am, network/Makefile.am, rtc/Makefile.am, + serial/Makefile.am: Remove. + * Makefile.am: Merge-in Makefile.am above. + Add preinstallation + compilation dirstamp support. + 2003-12-02 Ralf Corsepius * ide/Makefile.am: Remove all-local: $(ARCH). diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am index 8500678fcf..8e94fea6a1 100644 --- a/c/src/libchip/Makefile.am +++ b/c/src/libchip/Makefile.am @@ -2,7 +2,231 @@ ## $Id$ ## -SUBDIRS = rtc serial network ide +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am + +if LIBCHIP +include_libchipdir = $(includedir)/libchip +include_libchip_HEADERS = +TMP_LIBS = +endif + +EXTRA_DIST = +noinst_HEADERS = + +# ide +libide_C_FILES = ide/ata.c ide/ide_controller.c +libide_OBJS = $(libide_C_FILES:ide/%.c=ide/$(ARCH)/%.$(OBJEXT)) + +noinst_HEADERS += ide/ata_internal.h + +if LIBCHIP +include_libchip_HEADERS += ide/ata.h ide/ide_ctrl_cfg.h ide/ide_ctrl.h \ + ide/ide_ctrl_io.h + +ide/$(ARCH)/$(dirstamp): + @$(mkinstalldirs) ide/$(ARCH) + @: > ide/$(ARCH)/$(dirstamp) +ide/$(ARCH)/%.$(OBJEXT): ide/%.c ide/$(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< +ide/$(ARCH)/libide.a: $(libide_OBJS) + $(make-library) +TMP_LIBS += ide/$(ARCH)/libide.a +endif + +EXTRA_DIST += $(libide_C_FILES) + +# network + +libnetchip_C_FILES = network/cs8900.c network/dec21140.c network/i82586.c \ + network/sonic.c network/if_fxp.c network/elnk.c network/open_eth.c +libnetchip_OBJS = \ + $(libnetchip_C_FILES:network/%.c=network/$(ARCH)/%.$(OBJEXT)) + +libnetchip_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ + +if LIBCHIP +if HAS_NETWORKING +include_libchip_HEADERS += network/cs8900.h network/i82586var.h \ + network/if_fxpvar.h network/sonic.h network/if_media.h network/mii.h \ + network/open_eth.h + +network/$(ARCH)/$(dirstamp): + @$(mkinstalldirs) network/$(ARCH) + @: > network/$(ARCH)/$(dirstamp) +network/$(ARCH)/%.$(OBJEXT): network/%.c network/$(ARCH)/$(dirstamp) + ${COMPILE} $(libnetchip_CPPFLAGS) -o $@ -c $< +network/$(ARCH)/libnetchip.a: $(libnetchip_OBJS) + $(make-library) +TMP_LIBS += network/$(ARCH)/libnetchip.a + +$(PROJECT_RELEASE)/lib/libnetchip$(LIB_VARIANT).a: network/$(ARCH)/libnetchip.a + $(INSTALL_DATA) $< $@ + +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/libnetchip$(LIB_VARIANT).a +endif +endif + +.PRECIOUS: network/$(ARCH)/libnetchip.a + +libnetchip_DOC_FILES = network/README network/README.cs8900 \ + network/README.dec21140 network/README.i82586 network/README.open_eth \ + network/README.sonic network/cs8900.c.bsp + +EXTRA_DIST += $(libnetchip_C_FILES) $(libnetchip_DOC_FILES) + +# rtc +librtcio_C_FILES = rtc/rtcprobe.c rtc/icm7170.c rtc/icm7170_reg.c \ + rtc/icm7170_reg2.c rtc/icm7170_reg4.c rtc/icm7170_reg8.c rtc/m48t08.c \ + rtc/m48t08_reg.c rtc/m48t08_reg2.c rtc/m48t08_reg4.c rtc/m48t08_reg8.c + +librtcio_OBJS = $(librtcio_C_FILES:rtc/%.c=rtc/$(ARCH)/%.$(OBJEXT)) + +if LIBCHIP +include_libchip_HEADERS += rtc/rtc.h rtc/icm7170.h rtc/m48t08.h + +rtc/$(ARCH)/$(dirstamp): + @$(mkinstalldirs) rtc/$(ARCH) + @: > rtc/$(ARCH)/$(dirstamp) +rtc/$(ARCH)/%.$(OBJEXT): rtc/%.c rtc/$(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< +rtc/$(ARCH)/librtcio.a: $(librtcio_OBJS) + $(make-library) +TMP_LIBS += rtc/$(ARCH)/librtcio.a +endif + +librtcio_DOC_FILES = rtc/README.ds1643 rtc/README.icm7170 rtc/README.m48t08 \ + rtc/README.m48t18 rtc/STATUS + +EXTRA_DIST += $(librtcio_C_FILES) $(librtcio_DOC_FILES) + +# serial +libserialio_C_FILES = serial/mc68681.c serial/mc68681_baud.c \ + serial/mc68681_reg.c serial/mc68681_reg2.c serial/mc68681_reg4.c \ + serial/mc68681_reg8.c serial/ns16550.c serial/z85c30.c \ + serial/z85c30_reg.c serial/serprobe.c serial/termios_baud2index.c \ + serial/termios_baud2num.c +libserialio_OBJS = \ + $(libserialio_C_FILES:serial/%.c=serial/$(ARCH)/%.$(OBJEXT)) + +noinst_HEADERS += serial/mc68681_p.h serial/ns16550_p.h serial/z85c30_p.h + +if LIBCHIP +include_libchip_HEADERS += serial/mc68681.h serial/ns16550.h serial/z85c30.h \ + serial/serial.h serial/sersupp.h + +serial/$(ARCH)/$(dirstamp): + @$(mkinstalldirs) serial/$(ARCH) + @: > serial/$(ARCH)/$(dirstamp) +serial/$(ARCH)/%.$(OBJEXT): serial/%.c serial/$(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< +serial/$(ARCH)/libserialio.a: $(libserialio_OBJS) + $(make-library) +TMP_LIBS += serial/$(ARCH)/libserialio.a +endif + +libserialio_DOC_FILES = serial/README.mc68681 serial/README.ns16550 \ + serial/README.xr88681 serial/README.z85c30 serial/STATUS + +all-local: $(PREINSTALL_FILES) $(TMP_LIBS) $(TMPINSTALL_FILES) + +EXTRA_DIST += $(libserialio_C_FILES) $(libserialio_DOC_FILES) + +CLEANDIRS = */$(ARCH) + +PREINSTALL_FILES = + +if LIBCHIP +$(PROJECT_INCLUDE)/libchip/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip + @: > $(PROJECT_INCLUDE)/libchip/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/$(dirstamp) +endif + +if LIBCHIP +$(PROJECT_INCLUDE)/libchip/ata.h: ide/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/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/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/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 + +if LIBCHIP +if HAS_NETWORKING +$(PROJECT_INCLUDE)/libchip/cs8900.h: network/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: network/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: network/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: network/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: network/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: network/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: network/open_eth.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/open_eth.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/open_eth.h +endif +endif + +if LIBCHIP +$(PROJECT_INCLUDE)/libchip/rtc.h: rtc/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: rtc/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: rtc/m48t08.h $(PROJECT_INCLUDE)/libchip/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/m48t08.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/m48t08.h +endif + +if LIBCHIP +$(PROJECT_INCLUDE)/libchip/mc68681.h: serial/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: serial/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: serial/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/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: serial/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/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/c/src/libchip/ide/Makefile.am b/c/src/libchip/ide/Makefile.am deleted file mode 100644 index b7501bc6c0..0000000000 --- a/c/src/libchip/ide/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -## -## $Id$ -## - -LIBNAME = libide -LIB = $(ARCH)/$(LIBNAME).a - -C_FILES = ata.c ide_controller.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -noinst_HEADERS = ata_internal.h - -OBJS = $(C_O_FILES) - -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am - -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: $(PREINSTALL_FILES) $(LIB) -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 deleted file mode 100644 index cc3822a25c..0000000000 --- a/c/src/libchip/network/Makefile.am +++ /dev/null @@ -1,82 +0,0 @@ -## -## $Id$ -## - -LIBNAME = libnetchip -LIB = $(ARCH)/$(LIBNAME).a - -C_FILES = cs8900.c dec21140.c i82586.c sonic.c if_fxp.c elnk.c open_eth.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am - -# -# Add local stuff here using += -# - -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 - -$(LIB): $(OBJS) - $(make-library) - -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a - -if HAS_NETWORKING -all-local: $(PREINSTALL_FILES) $(OBJS) $(LIB) $(TMPINSTALL_FILES) -endif -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 - -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 deleted file mode 100644 index f075d7f920..0000000000 --- a/c/src/libchip/rtc/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -## -## $Id$ -## - -LIBNAME = librtcio -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 - -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am - -# -# 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: $(PREINSTALL_FILES) $(LIB) -endif - -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 deleted file mode 100644 index 73d86ea5e6..0000000000 --- a/c/src/libchip/serial/Makefile.am +++ /dev/null @@ -1,65 +0,0 @@ -# -# $Id$ -# - -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 -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -noinst_HEADERS = mc68681_p.h ns16550_p.h z85c30_p.h - -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am - -# -# 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: $(PREINSTALL_FILES) $(LIB) -endif - -DOC_FILES = README.mc68681 README.ns16550 README.xr88681 README.z85c30 \ - 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/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