From 1bb55d659a94b5bd5eb382be70716df90e067566 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 2 Dec 2003 16:51:06 +0000 Subject: 2003-12-02 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * 3c509/Makefile.am: Cosmetics. * clock/Makefile.am: Cosmetics. * console/Makefile.am: Add preinstallation dirstamp support. * ide/Makefile.am: Cosmetics. * ne2000/Makefile.am: Cosmetics. * start/Makefile.am: Add compilation dirstamp support. * startup/Makefile.am: Cosmetics. * timer/Makefile.am: Cosmetics. * wd8003/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/i386/pc386/3c509/Makefile.am | 1 - c/src/lib/libbsp/i386/pc386/ChangeLog | 14 +++++++++ c/src/lib/libbsp/i386/pc386/Makefile.am | 12 ++++---- c/src/lib/libbsp/i386/pc386/clock/Makefile.am | 1 - c/src/lib/libbsp/i386/pc386/console/Makefile.am | 41 +++++++++++++++++-------- c/src/lib/libbsp/i386/pc386/ide/Makefile.am | 1 - c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am | 1 - c/src/lib/libbsp/i386/pc386/start/Makefile.am | 4 +-- c/src/lib/libbsp/i386/pc386/startup/Makefile.am | 1 - c/src/lib/libbsp/i386/pc386/timer/Makefile.am | 4 +-- c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am | 1 - c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am | 5 +-- 12 files changed, 56 insertions(+), 30 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am index d8e8756559..5374b22cdd 100644 --- a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/3c509.rel C_FILES = 3c509.c elink.c diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index 7993d95ae7..8092b6ea08 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -1,3 +1,17 @@ +2003-12-02 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * 3c509/Makefile.am: Cosmetics. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Add preinstallation dirstamp support. + * ide/Makefile.am: Cosmetics. + * ne2000/Makefile.am: Cosmetics. + * start/Makefile.am: Add compilation dirstamp support. + * startup/Makefile.am: Cosmetics. + * timer/Makefile.am: Cosmetics. + * wd8003/Makefile.am: Cosmetics. + * wrapup/Makefile.am: Cosmetics. + 2003-12-02 Ralf Corsepius * 3c509/Makefile.am: Remove all-local: $(ARCH). diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am index b9518547a7..0572d86e1e 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/Makefile.am @@ -30,17 +30,17 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = HOWTO README.dec21140 STATUS times_i486dx times_p5 if HAS_NETWORKING -$(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/wd80x3.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/wd80x3.h endif -$(PROJECT_INCLUDE)/crt.h: include/crt.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/crt.h: include/crt.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/crt.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/crt.h -$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/i386/pc386/clock/Makefile.am b/c/src/lib/libbsp/i386/pc386/clock/Makefile.am index 77fe009d17..575a9d79e7 100644 --- a/c/src/lib/libbsp/i386/pc386/clock/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = ckinit.c rtc.c diff --git a/c/src/lib/libbsp/i386/pc386/console/Makefile.am b/c/src/lib/libbsp/i386/pc386/console/Makefile.am index 057abb912b..ccc1d7dc80 100644 --- a/c/src/lib/libbsp/i386/pc386/console/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel include_rtemsdir = $(includedir)/rtems @@ -12,15 +11,12 @@ C_FILES = console.c inch.c outch.c defkeymap.c fb_vga.c keyboard.c \ mouse_parser.c pc_keyb.c ps2_mouse.c serial_mouse.c vgainit.c vt.c S_FILES = videoAsm.S -console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) +console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \ + $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am -PREINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(PROJECT_INCLUDE)/rtems \ - $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) - # # (OPTIONAL) Add local stuff here using += # @@ -28,12 +24,6 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE) \ $(PGM): $(console_rel_OBJECTS) $(make-rel) -$(PROJECT_INCLUDE)/rtems: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/rtems/%.h: %.h - $(INSTALL_DATA) $< $@ - # the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile @@ -43,4 +33,31 @@ all-local: $(PREINSTALL_FILES) $(console_rel_OBJECTS) $(PGM) EXTRA_DIST = $(C_FILES) $(S_FILES) +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/rtems/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems + @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/$(dirstamp) + +$(PROJECT_INCLUDE)/rtems/keyboard.h: keyboard.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/keyboard.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/keyboard.h + +$(PROJECT_INCLUDE)/rtems/kd.h: kd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/kd.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/kd.h + +$(PROJECT_INCLUDE)/rtems/serial_mouse.h: serial_mouse.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/serial_mouse.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/serial_mouse.h + +$(PROJECT_INCLUDE)/rtems/ps2_drv.h: ps2_drv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ps2_drv.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ps2_drv.h + +$(PROJECT_INCLUDE)/rtems/fb_vga.h: fb_vga.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fb_vga.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fb_vga.h + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/pc386/ide/Makefile.am b/c/src/lib/libbsp/i386/pc386/ide/Makefile.am index 96c963ecbc..7163ac8929 100644 --- a/c/src/lib/libbsp/i386/pc386/ide/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/ide/Makefile.am @@ -2,7 +2,6 @@ ## Makefile.am,v 1.5 2002/08/11 06:59:03 ralf Exp ## - PGM = C_FILES = idecfg.c ide.c diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am index 7016d8b950..d5f1b51923 100644 --- a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/ne2000.rel C_FILES = ne2000.c diff --git a/c/src/lib/libbsp/i386/pc386/start/Makefile.am b/c/src/lib/libbsp/i386/pc386/start/Makefile.am index 64df1fd782..2a2fbb18b8 100644 --- a/c/src/lib/libbsp/i386/pc386/start/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/start/Makefile.am @@ -26,10 +26,10 @@ install-data-local: $(START_O_FILES) $(INSTALL_DATA) $$i $(DESTDIR)$(bsplibdir); \ done -$(ARCH)/start16.$(OBJEXT): start16.S +$(ARCH)/start16.$(OBJEXT): start16.S $(ARCH)/$(dirstamp) $(COMPILE.S) $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ $< -$(ARCH)/start16.bin: $(ARCH)/start16.$(OBJEXT) +$(ARCH)/start16.bin: $(ARCH)/start16.$(OBJEXT) $(ARCH)/$(dirstamp) $(LD) -N -T $(LINKCMDS) -Ttext $(START16ADDR) -e start16 -nostdlib \ --oformat=elf32-i386 \ -o $(basename $@)-elf32.$(OBJEXT) $(basename $@).$(OBJEXT) diff --git a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am b/c/src/lib/libbsp/i386/pc386/startup/Makefile.am index c9adcb5fe7..5d475fd40d 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/startup/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/irq:@srcdir@/../../shared/comm:@srcdir@/../../shared/pci PGM = $(ARCH)/startup.rel diff --git a/c/src/lib/libbsp/i386/pc386/timer/Makefile.am b/c/src/lib/libbsp/i386/pc386/timer/Makefile.am index 4b17918876..42fd2aaa5e 100644 --- a/c/src/lib/libbsp/i386/pc386/timer/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/timer/Makefile.am @@ -2,12 +2,12 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c S_FILES = timerisr.S -timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) +timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \ + $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am index 9dce9af509..f58672abb7 100644 --- a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/wd8003.rel C_FILES = wd8003.c diff --git a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am index 151803d537..5d019aeaff 100644 --- a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am @@ -11,8 +11,9 @@ endif BSP_FILES = startup clock console timer $(NETWORK) ide # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ - $(wildcard ../../../../libcpu/i386/$(ARCH)/*.$(OBJEXT)) +OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ + ../../../../libcpu/i386/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a include $(top_srcdir)/../../../../automake/compile.am -- cgit v1.2.3