From bdd608261827fd5acc428108557b465e04fd1613 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 18 Sep 2014 11:07:41 +0200 Subject: bsps: Fix build error Fix build error introduced in f535fe5311978af53635c2da8e5cb10ef9d78802. --- c/src/lib/libbsp/powerpc/beatnik/Makefile.am | 2 -- c/src/lib/libbsp/powerpc/beatnik/preinstall.am | 4 ---- c/src/lib/libbsp/powerpc/gen5200/Makefile.am | 2 -- c/src/lib/libbsp/powerpc/gen5200/preinstall.am | 4 ---- c/src/lib/libbsp/powerpc/gen83xx/Makefile.am | 2 -- c/src/lib/libbsp/powerpc/gen83xx/preinstall.am | 4 ---- c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am | 1 - c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am | 4 ---- c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am | 4 ---- c/src/lib/libbsp/powerpc/mvme3100/Makefile.am | 1 - c/src/lib/libbsp/powerpc/mvme3100/preinstall.am | 4 ---- c/src/lib/libbsp/powerpc/mvme5500/Makefile.am | 1 - c/src/lib/libbsp/powerpc/mvme5500/preinstall.am | 4 ---- c/src/lib/libbsp/powerpc/qoriq/Makefile.am | 2 -- c/src/lib/libbsp/powerpc/qoriq/preinstall.am | 4 ---- c/src/lib/libbsp/powerpc/score603e/Makefile.am | 1 - c/src/lib/libbsp/powerpc/score603e/preinstall.am | 4 ---- c/src/lib/libbsp/powerpc/t32mppc/Makefile.am | 2 -- c/src/lib/libbsp/powerpc/t32mppc/preinstall.am | 4 ---- 20 files changed, 1 insertion(+), 55 deletions(-) (limited to 'c/src/lib/libbsp/powerpc') diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am index 958dfe506f..24351edd7d 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am +++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am @@ -209,8 +209,6 @@ network_if_em.rel: network_if_em_tmp.rel endif # tod -nodist_include_HEADERS += ../../shared/tod.h - libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ diff --git a/c/src/lib/libbsp/powerpc/beatnik/preinstall.am b/c/src/lib/libbsp/powerpc/beatnik/preinstall.am index b3093ab2e3..a6551ff30d 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/preinstall.am +++ b/c/src/lib/libbsp/powerpc/beatnik/preinstall.am @@ -186,7 +186,3 @@ $(PROJECT_INCLUDE)/bsp/if_em_pub.h: network/if_em/if_em_pub.h $(PROJECT_INCLUDE) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/if_em_pub.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/if_em_pub.h endif -$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h - diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am index 6bef55db6c..c871575774 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am @@ -21,8 +21,6 @@ noinst_PROGRAMS = include_HEADERS += ../../shared/include/coverhd.h -nodist_include_HEADERS += ../../shared/tod.h - noinst_LIBRARIES = libbspstart.a libbspstart_a_SOURCES = start/start.S project_lib_DATA = start.$(OBJEXT) diff --git a/c/src/lib/libbsp/powerpc/gen5200/preinstall.am b/c/src/lib/libbsp/powerpc/gen5200/preinstall.am index 75a41ea31d..ed1d734d90 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/preinstall.am +++ b/c/src/lib/libbsp/powerpc/gen5200/preinstall.am @@ -81,10 +81,6 @@ $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h -$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h - $(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am index f32c299bc6..3e24d308bd 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am @@ -31,8 +31,6 @@ noinst_PROGRAMS = include_HEADERS += ../../shared/include/coverhd.h -nodist_include_HEADERS += ../../shared/tod.h - noinst_LIBRARIES = libbspstart.a libbspstart_a_SOURCES = start/start.S project_lib_DATA = start.$(OBJEXT) diff --git a/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am b/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am index 8b06af20a2..c2575ab3d0 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am +++ b/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am @@ -105,10 +105,6 @@ $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h -$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h - $(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index 1c829f7b43..9fc73c02bd 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -23,7 +23,6 @@ noinst_PROGRAMS = include_HEADERS += ../../powerpc/shared/include/nvram.h include_HEADERS += ../../shared/include/coverhd.h -include_HEADERS += ../../shared/tod.h noinst_LIBRARIES = libbspstart.a libbspstart_a_SOURCES = ../../powerpc/shared/start/start.S diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am index 86585eb769..da1b9ef725 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am @@ -61,10 +61,6 @@ $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h -$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h - $(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am index 5d007a854b..0dfc533614 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am @@ -44,7 +44,7 @@ libbsp_a_SOURCES = include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h -nodist_include_HEADERS = include/bspopts.h ../../shared/tod.h \ +nodist_include_HEADERS = include/bspopts.h \ ../../shared/include/coverhd.h include_bsp_HEADERS = include_bsp_HEADERS += ../../../libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am index dd192b0eba..cbfc534037 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am @@ -129,10 +129,6 @@ $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h -$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h - $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am index e663c3d2a3..22e793e87a 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am @@ -17,7 +17,6 @@ DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = include_HEADERS += ../../shared/include/coverhd.h -include_HEADERS += ../../shared/tod.h project_lib_DATA = diff --git a/c/src/lib/libbsp/powerpc/mvme3100/preinstall.am b/c/src/lib/libbsp/powerpc/mvme3100/preinstall.am index 5865adf6f5..b8862b4628 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/preinstall.am +++ b/c/src/lib/libbsp/powerpc/mvme3100/preinstall.am @@ -57,10 +57,6 @@ $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h -$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h - $(PROJECT_LIB)/motld_start.$(OBJEXT): motld_start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/motld_start.$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/motld_start.$(OBJEXT) diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am index ebe4f6409d..805a1f96c0 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am @@ -57,7 +57,6 @@ include_bsp_HEADERS += irq/irq.h # irq libbsp_a_SOURCES += irq/irq_init.c irq/BSP_irq.c -nodist_include_HEADERS += ../../shared/tod.h # tod libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c diff --git a/c/src/lib/libbsp/powerpc/mvme5500/preinstall.am b/c/src/lib/libbsp/powerpc/mvme5500/preinstall.am index 796f97737c..f7ca7825a8 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/preinstall.am +++ b/c/src/lib/libbsp/powerpc/mvme5500/preinstall.am @@ -81,10 +81,6 @@ $(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h -$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h - $(PROJECT_INCLUDE)/bsp/bspException.h: vectors/bspException.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspException.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspException.h diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am index 24da4d23f4..ebd4160c41 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am @@ -18,8 +18,6 @@ noinst_PROGRAMS = include_HEADERS += ../../shared/include/coverhd.h -nodist_include_HEADERS += ../../shared/tod.h - include_bsp_HEADERS = include/irq.h \ ../../shared/include/irq-generic.h \ ../../shared/include/irq-info.h \ diff --git a/c/src/lib/libbsp/powerpc/qoriq/preinstall.am b/c/src/lib/libbsp/powerpc/qoriq/preinstall.am index 0843a7afd4..3b947fb58f 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/preinstall.am +++ b/c/src/lib/libbsp/powerpc/qoriq/preinstall.am @@ -53,10 +53,6 @@ $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h -$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h - $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index 264a30c7bf..2e9eebb9cf 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -14,7 +14,6 @@ nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h -include_HEADERS += ../../shared/tod.h include_HEADERS += ../../shared/include/coverhd.h include/gen2.h ### diff --git a/c/src/lib/libbsp/powerpc/score603e/preinstall.am b/c/src/lib/libbsp/powerpc/score603e/preinstall.am index 2756fa131b..da25a435d4 100644 --- a/c/src/lib/libbsp/powerpc/score603e/preinstall.am +++ b/c/src/lib/libbsp/powerpc/score603e/preinstall.am @@ -53,10 +53,6 @@ $(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INC $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h -$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h - $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am index 864b4c14bc..e251adea35 100644 --- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am @@ -18,8 +18,6 @@ noinst_PROGRAMS = include_HEADERS += ../../shared/include/coverhd.h -nodist_include_HEADERS += ../../shared/tod.h - include_bsp_HEADERS = include/irq.h \ ../../shared/include/irq-generic.h \ ../../shared/include/irq-info.h \ diff --git a/c/src/lib/libbsp/powerpc/t32mppc/preinstall.am b/c/src/lib/libbsp/powerpc/t32mppc/preinstall.am index 8a404f8a3e..3b27653920 100644 --- a/c/src/lib/libbsp/powerpc/t32mppc/preinstall.am +++ b/c/src/lib/libbsp/powerpc/t32mppc/preinstall.am @@ -53,10 +53,6 @@ $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h -$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h - $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h -- cgit v1.2.3