diff options
| author | Chris Johns <chrisj@rtems.org> | 2017-12-24 06:54:10 +1100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-01-05 14:23:58 +0100 |
| commit | 2c97a8fecc4b6440d725bd158bf906b51201399d (patch) | |
| tree | 038e9e1cc412b229d6d52f2d857d52de9f51c02f | |
| parent | 3991a7c5a6b1ed8cc57d3364cb5bfe4853e63624 (diff) | |
Remove preinstall from the build system.
Update #3254.
324 files changed, 710 insertions, 3526 deletions
diff --git a/aclocal/rtems-bsp-includes.m4 b/aclocal/rtems-bsp-includes.m4 new file mode 100644 index 0000000000..394d50acd4 --- /dev/null +++ b/aclocal/rtems-bsp-includes.m4 @@ -0,0 +1,23 @@ +dnl +dnl RTEMS Include paths. +dnl +AC_DEFUN([RTEMS_BSP_INCLUDES], +[ +AC_REQUIRE([RTEMS_SOURCE_TOP]) +AC_REQUIRE([RTEMS_BUILD_TOP]) + +RTEMS_BSP_INCLUDE_BSP="-I${RTEMS_SOURCE_ROOT}/bsps/include" +RTEMS_BSP_INCLUDE_BSP_ARCH="-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/include" +RTEMS_BSP_INCLUDE_BSP_ARCH_BSP="-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP)/include" +RTEMS_BSP_INCLUDE_BSP_FAMILY="-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include" +RTEMS_BSP_ARCH_INCLUDE="${RTEMS_BSP_INCLUDE_BSP} ${RTEMS_BSP_INCLUDE_BSP_ARCH}" +RTEMS_BSP_ARCH_INCLUDE="${RTEMS_BSP_ARCH_INCLUDE} ${RTEMS_BSP_INCLUDE_BSP_ARCH_BSP} ${RTEMS_BSP_INCLUDE_BSP_FAMILY}" + +RTEMS_BSP_BUILD_INCLUDE="-I${RTEMS_BUILD_ROOT}/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include" + +RTEMS_BSP_INCLUDE="${RTEMS_BSP_BUILD_INCLUDE} ${RTEMS_BSP_ARCH_INCLUDE}" + +RTEMS_BSP_CPPFLAGS="${RTEMS_BSP_INCLUDE}" + +AC_SUBST([RTEMS_BSP_CPPFLAGS]) +]) diff --git a/aclocal/rtems-build-top.m4 b/aclocal/rtems-build-top.m4 new file mode 100644 index 0000000000..5708119c14 --- /dev/null +++ b/aclocal/rtems-build-top.m4 @@ -0,0 +1,12 @@ +dnl +dnl RTEMS_BUILD_TOP($1) +dnl +AC_DEFUN([RTEMS_BUILD_TOP], +[dnl +# +# This is a copy of the horrible hack in rtems-top.m4 and it is simpler to +# copy it that attempt to clean this crap up. +# +RTEMS_BUILD_ROOT="${with_rtems_build_top}" +AC_SUBST([RTEMS_BUILD_ROOT]) +])dnl diff --git a/aclocal/rtems-includes.m4 b/aclocal/rtems-includes.m4 new file mode 100644 index 0000000000..ca4ebed581 --- /dev/null +++ b/aclocal/rtems-includes.m4 @@ -0,0 +1,23 @@ +dnl +dnl RTEMS Include paths. +dnl +AC_DEFUN([RTEMS_INCLUDES], +[ +AC_REQUIRE([RTEMS_SOURCE_TOP]) +AC_REQUIRE([RTEMS_BUILD_TOP]) + +# Was CFLAGS set? +rtems_cv_CFLAGS_set="${CFLAGS+set}" + +RTEMS_INCLUDE_CPUKIT="-I${RTEMS_SOURCE_ROOT}/cpukit/include" +RTEMS_INCLUDE_CPUKIT_ARCH="-I${RTEMS_SOURCE_ROOT}/cpukit/score/cpu/\$(RTEMS_CPU)/include" + +RTEMS_CPUKIT_INCLUDE="${RTEMS_INCLUDE_CPUKIT} ${RTEMS_INCLUDE_CPUKIT_ARCH}" +RTEMS_BUILD_INCLUDE="-I\$(top_builddir) -I${RTEMS_BUILD_ROOT}/include" + +RTEMS_INCLUDE="${RTEMS_BUILD_INCLUDE} ${RTEMS_CPUKIT_INCLUDE}" + +RTEMS_CPPFLAGS="${RTEMS_INCLUDE}" + +AC_SUBST([RTEMS_CPPFLAGS]) +]) diff --git a/aclocal/rtems-source-top.m4 b/aclocal/rtems-source-top.m4 new file mode 100644 index 0000000000..d1460ae82d --- /dev/null +++ b/aclocal/rtems-source-top.m4 @@ -0,0 +1,8 @@ +dnl +dnl RTEMS_SOURCE_TOP +dnl +AC_DEFUN([RTEMS_SOURCE_TOP], +[dnl +RTEMS_SOURCE_ROOT="${with_rtems_source_top}" +AC_SUBST([RTEMS_SOURCE_ROOT]) +])dnl diff --git a/automake/host.am b/automake/host.am index 7367d006a0..f999b83776 100644 --- a/automake/host.am +++ b/automake/host.am @@ -3,6 +3,3 @@ ## Once automake is fully integrated these make targets ## and this file will probably be removed -preinstall-am: $(PREINSTALL_FILES) -preinstall: preinstall-am -.PHONY: preinstall preinstall-am diff --git a/automake/local.am b/automake/local.am index 4de51e5197..8068b4c61c 100644 --- a/automake/local.am +++ b/automake/local.am @@ -1,5 +1,3 @@ -preinstall-am: $(PREINSTALL_FILES) -preinstall: preinstall-am -.PHONY: preinstall preinstall-am - PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools + +all-local: $(TMPINSTALL_FILES) diff --git a/automake/subdirs.am b/automake/subdirs.am index 7ebc65a35b..37617e0759 100644 --- a/automake/subdirs.am +++ b/automake/subdirs.am @@ -5,26 +5,3 @@ ## Once automake is fully integrated these make targets ## and this file will probably be removed -preinstall-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -## This trick allows "-k" to keep its natural meaning when running a -## recursive rule. - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -preinstall: preinstall-recursive -.PHONY: preinstall-recursive diff --git a/c/Makefile.am b/c/Makefile.am index 81d8b7801f..f2ad7d00b7 100644 --- a/c/Makefile.am +++ b/c/Makefile.am @@ -12,7 +12,6 @@ DIST_SUBDIRS = $(RTEMS_BSP) ## Let all RTEMS' make targets depend on ${RTEMS_BSP} all-local: $(RTEMS_BSP) -preinstall-am: $(RTEMS_BSP) ## Pull in extra files intro the distribution EXTRA_DIST = ACKNOWLEDGEMENTS diff --git a/c/configure.ac b/c/configure.ac index 052891568b..9ccddcd1f1 100644 --- a/c/configure.ac +++ b/c/configure.ac @@ -5,6 +5,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([src]) RTEMS_TOP(..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU @@ -65,6 +67,7 @@ AC_SUBST(RTEMS_BSP_LIST) # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile],[ for bsp in : $RTEMS_BSP_LIST; do test "x$bsp" = x: && continue +rtems_source_top=$(cd ${srcdir}/.. && pwd) cat >> Makefile << BSPEOF $bsp: src/configure @@ -72,7 +75,8 @@ $bsp: src/configure echo "Configuring RTEMS_BSP=$bsp"; \\ \$(MKDIR_P) $bsp; \\ ( cd $bsp && \\ - CONFIG_SHELL=\$(SHELL) RTEMS_BSP=$bsp \$(rtems_bsp_configure) ) \\ + CONFIG_SHELL=\$(SHELL) RTEMS_BSP=$bsp \$(rtems_bsp_configure) \\ + --with-rtems-build-top=\$\${PWD} --with-rtems-source-top=${rtems_source_top} ) \\ || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; BSPEOF done diff --git a/c/src/Makefile.am b/c/src/Makefile.am index 8fcdd645eb..08ec689f3f 100644 --- a/c/src/Makefile.am +++ b/c/src/Makefile.am @@ -3,6 +3,13 @@ ACLOCAL_AMFLAGS = -I aclocal _SUBDIRS = . @BSP_SUBDIRS@ DIST_SUBDIRS = @BSP_SUBDIRS@ +$(PROJECT_LIB)/$(dirstamp): + @echo "Making project library directory: $(PROJECT_LIB)" + @$(MKDIR_P) $(PROJECT_LIB) + @: > $(PROJECT_LIB)/$(dirstamp) + +all-local: $(PROJECT_LIB)/$(dirstamp) + clean-local: $(RM) -r $(PROJECT_RELEASE) @@ -23,13 +30,6 @@ DISTCLEANFILES += @CUSTOM_CFG_FILES@ noinst_DATA += make/custom/default.cfg DISTCLEANFILES += make/custom/default.cfg -noinst_DATA += preinstall-stamp - -preinstall-stamp: - $(MAKE) $(AM_MAKEFLAGS) preinstall - touch preinstall-stamp -CLEANFILES = preinstall-stamp - @host_alias@-@RTEMS_BSP@.pc: config.status bsp.pc.in ./config.status --file=$@:$(srcdir)/bsp.pc.in diff --git a/c/src/aclocal/prog-cc.m4 b/c/src/aclocal/prog-cc.m4 index 44dfd2ddd7..ec33bc9bcf 100644 --- a/c/src/aclocal/prog-cc.m4 +++ b/c/src/aclocal/prog-cc.m4 @@ -29,18 +29,15 @@ dnl check if the compiler supports --specs RTEMS_GCC_SPECS AS_IF([test x"$rtems_cv_gcc_specs" = xyes],[ -GCCSPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/" +GCCSPECS="-B\$(RTEMS_SOURCE_ROOT)/c/src/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/" GCCSPECS="${GCCSPECS} -specs bsp_specs -qrtems"]) AC_SUBST(GCCSPECS) -AS_IF([test x"$rtems_cv_gcc_isystem" = xyes],[ - RTEMS_CPPFLAGS="-isystem \$(PROJECT_INCLUDE)"],[ - RTEMS_CPPFLAGS="-I\$(PROJECT_INCLUDE)" -]) -AC_SUBST(RTEMS_CPPFLAGS) - AS_IF([test "$GCC" = yes],[ RTEMS_RELLDFLAGS="-qnolinkcmds -nostdlib -r" ]) AC_SUBST(RTEMS_RELLDFLAGS) + +RTEMS_INCLUDES +RTEMS_BSP_INCLUDES ]) diff --git a/c/src/aclocal/rtems-bsp-includes.m4 b/c/src/aclocal/rtems-bsp-includes.m4 new file mode 100644 index 0000000000..394d50acd4 --- /dev/null +++ b/c/src/aclocal/rtems-bsp-includes.m4 @@ -0,0 +1,23 @@ +dnl +dnl RTEMS Include paths. +dnl +AC_DEFUN([RTEMS_BSP_INCLUDES], +[ +AC_REQUIRE([RTEMS_SOURCE_TOP]) +AC_REQUIRE([RTEMS_BUILD_TOP]) + +RTEMS_BSP_INCLUDE_BSP="-I${RTEMS_SOURCE_ROOT}/bsps/include" +RTEMS_BSP_INCLUDE_BSP_ARCH="-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/include" +RTEMS_BSP_INCLUDE_BSP_ARCH_BSP="-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP)/include" +RTEMS_BSP_INCLUDE_BSP_FAMILY="-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include" +RTEMS_BSP_ARCH_INCLUDE="${RTEMS_BSP_INCLUDE_BSP} ${RTEMS_BSP_INCLUDE_BSP_ARCH}" +RTEMS_BSP_ARCH_INCLUDE="${RTEMS_BSP_ARCH_INCLUDE} ${RTEMS_BSP_INCLUDE_BSP_ARCH_BSP} ${RTEMS_BSP_INCLUDE_BSP_FAMILY}" + +RTEMS_BSP_BUILD_INCLUDE="-I${RTEMS_BUILD_ROOT}/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include" + +RTEMS_BSP_INCLUDE="${RTEMS_BSP_BUILD_INCLUDE} ${RTEMS_BSP_ARCH_INCLUDE}" + +RTEMS_BSP_CPPFLAGS="${RTEMS_BSP_INCLUDE}" + +AC_SUBST([RTEMS_BSP_CPPFLAGS]) +]) diff --git a/c/src/aclocal/rtems-build-top.m4 b/c/src/aclocal/rtems-build-top.m4 new file mode 100644 index 0000000000..5708119c14 --- /dev/null +++ b/c/src/aclocal/rtems-build-top.m4 @@ -0,0 +1,12 @@ +dnl +dnl RTEMS_BUILD_TOP($1) +dnl +AC_DEFUN([RTEMS_BUILD_TOP], +[dnl +# +# This is a copy of the horrible hack in rtems-top.m4 and it is simpler to +# copy it that attempt to clean this crap up. +# +RTEMS_BUILD_ROOT="${with_rtems_build_top}" +AC_SUBST([RTEMS_BUILD_ROOT]) +])dnl diff --git a/c/src/aclocal/rtems-includes.m4 b/c/src/aclocal/rtems-includes.m4 new file mode 100644 index 0000000000..ca4ebed581 --- /dev/null +++ b/c/src/aclocal/rtems-includes.m4 @@ -0,0 +1,23 @@ +dnl +dnl RTEMS Include paths. +dnl +AC_DEFUN([RTEMS_INCLUDES], +[ +AC_REQUIRE([RTEMS_SOURCE_TOP]) +AC_REQUIRE([RTEMS_BUILD_TOP]) + +# Was CFLAGS set? +rtems_cv_CFLAGS_set="${CFLAGS+set}" + +RTEMS_INCLUDE_CPUKIT="-I${RTEMS_SOURCE_ROOT}/cpukit/include" +RTEMS_INCLUDE_CPUKIT_ARCH="-I${RTEMS_SOURCE_ROOT}/cpukit/score/cpu/\$(RTEMS_CPU)/include" + +RTEMS_CPUKIT_INCLUDE="${RTEMS_INCLUDE_CPUKIT} ${RTEMS_INCLUDE_CPUKIT_ARCH}" +RTEMS_BUILD_INCLUDE="-I\$(top_builddir) -I${RTEMS_BUILD_ROOT}/include" + +RTEMS_INCLUDE="${RTEMS_BUILD_INCLUDE} ${RTEMS_CPUKIT_INCLUDE}" + +RTEMS_CPPFLAGS="${RTEMS_INCLUDE}" + +AC_SUBST([RTEMS_CPPFLAGS]) +]) diff --git a/c/src/aclocal/rtems-source-top.m4 b/c/src/aclocal/rtems-source-top.m4 new file mode 100644 index 0000000000..d1460ae82d --- /dev/null +++ b/c/src/aclocal/rtems-source-top.m4 @@ -0,0 +1,8 @@ +dnl +dnl RTEMS_SOURCE_TOP +dnl +AC_DEFUN([RTEMS_SOURCE_TOP], +[dnl +RTEMS_SOURCE_ROOT="${with_rtems_source_top}" +AC_SUBST([RTEMS_SOURCE_ROOT]) +])dnl diff --git a/c/src/automake/compile.am b/c/src/automake/compile.am index a42e4f3949..2cd9fd5d91 100644 --- a/c/src/automake/compile.am +++ b/c/src/automake/compile.am @@ -1,12 +1,14 @@ ## ------------------------------------------------------------------------- -CC = @CC@ $(GCCSPECS) -CXX = @CXX@ $(GCCSPECS) -CPP = @CPP@ $(GCCSPECS) -CCAS = @CCAS@ $(GCCSPECS) +CC = @CC@ +CXX = @CXX@ +CPP = @CPP@ +CCAS = @CCAS@ ## -AM_CPPFLAGS = @RTEMS_CPPFLAGS@ +AM_CPPFLAGS = @RTEMS_CPPFLAGS@ @RTEMS_BSP_CPPFLAGS@ AM_CFLAGS = AM_CXXFLAGS = AM_CCASFLAGS = @RTEMS_CCASFLAGS@ + +ARFLAGS = crD diff --git a/c/src/automake/host.am b/c/src/automake/host.am index c25c0526a4..2f0beadd89 100644 --- a/c/src/automake/host.am +++ b/c/src/automake/host.am @@ -3,6 +3,3 @@ ## Once automake is fully integrated these make targets ## and this file will probably be removed -preinstall-am: $(PREINSTALL_FILES) -preinstall: preinstall-am -.PHONY: preinstall preinstall-am diff --git a/c/src/automake/local.am b/c/src/automake/local.am index 4de51e5197..8068b4c61c 100644 --- a/c/src/automake/local.am +++ b/c/src/automake/local.am @@ -1,5 +1,3 @@ -preinstall-am: $(PREINSTALL_FILES) -preinstall: preinstall-am -.PHONY: preinstall preinstall-am - PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools + +all-local: $(TMPINSTALL_FILES) diff --git a/c/src/automake/subdirs.am b/c/src/automake/subdirs.am index 2f39d858ce..6ae7ff05a1 100644 --- a/c/src/automake/subdirs.am +++ b/c/src/automake/subdirs.am @@ -17,29 +17,7 @@ SUBDIRS_no_dot_no_wrapup_no_testsuites = $(filter-out testsuites,$(SUBDIRS_no_do SUBDIRS_wrapup = $(filter wrapup,$(SUBDIRS_no_dot)) SUBDIRS_testsuites = $(filter testsuites,$(SUBDIRS_no_dot)) -SUBDIR_TARGET = $(subst /,-,$1) -PREINSTALL_TARGET = preinstall-$(call SUBDIR_TARGET,$(1)) - -preintstall_targets = $(if "$(SUBDIRS_dot)" ".",preinstall-dot) $(foreach D,$(SUBDIRS_no_dot),$(call PREINSTALL_TARGET,$(D))) - -define PREINSTALL_DIR -.PHONY: $1 -$1: - @+set fnord $(MAKEFLAGS); amf=$$$$2; \ - subdir=$(2); \ - subdir_label=`echo $(1) | sed -e 's/preinstall-//'`; \ - target=`echo $$@ | sed -e 's/-recursive//' -e "s/-$$$${subdir_label}//"`$(3); \ - echo "Making $$$$target in $$$$subdir"; \ - (cd $$$$subdir && $(MAKE) $(AM_MAKEFLAGS) $$$$target) \ - || case "$$$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; -endef - -$(if "$(SUBDIRS_dot)" ".",$(eval $(call PREINSTALL_DIR,preinstall-dot,.,-am))) - -$(foreach D,$(SUBDIRS_no_dot),$(eval $(call PREINSTALL_DIR,$(call PREINSTALL_TARGET,$(D)),$(D)))) - preinstall: $(preintstall_targets) -.PHONY: preinstall define CPUKITDIR .PHONY: $1 @@ -84,4 +62,4 @@ $(if "$(SUBDIRS_testsuites)" "testsuites",testsuites: dot $(SUBDIRS_no_dot_no_te # # The general build all rule for automake. # -all-local: preinstall $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot) +all-local: $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot) diff --git a/c/src/configure.ac b/c/src/configure.ac index b55962cb65..72e84b6138 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -5,6 +5,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([libchip]) RTEMS_TOP(../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_ENABLE_CXX RTEMS_ENABLE_NETWORKING @@ -14,7 +16,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define subdir-objects no-exeext foreign 1.12.2]) AM_MAINTAINER_MODE -RTEMS_ENABLE_MULTILIB RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_CXX RTEMS_ENV_RTEMSBSP diff --git a/c/src/lib/libbsp/Makefile.am b/c/src/lib/libbsp/Makefile.am index 0071a96155..486fbbe605 100644 --- a/c/src/lib/libbsp/Makefile.am +++ b/c/src/lib/libbsp/Makefile.am @@ -31,15 +31,5 @@ EXTRA_DIST += shared/include/bootcard.h EXTRA_DIST += shared/pci/pci_bus_count.c EXTRA_DIST += shared/pci/pci_find_device.c -include_bspdir = $(includedir)/bsp - -include_bsp_HEADERS = -include_bsp_HEADERS += shared/include/default-initial-extension.h -include_bsp_HEADERS += shared/include/fatal.h -include_bsp_HEADERS += shared/include/fdt.h -include_bsp_HEADERS += shared/include/console-termios.h -include_bsp_HEADERS += shared/include/gpio.h - -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am include $(top_srcdir)/automake/subdirs.am diff --git a/c/src/lib/libbsp/arm/Makefile.am b/c/src/lib/libbsp/arm/Makefile.am index a8a0178560..4d3c25877d 100644 --- a/c/src/lib/libbsp/arm/Makefile.am +++ b/c/src/lib/libbsp/arm/Makefile.am @@ -5,9 +5,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## added but it is present in the source tree. _SUBDIRS = @RTEMS_BSP_FAMILY@ -include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = shared/include/linker-symbols.h - dist_project_lib_DATA = shared/startup/linkcmds.base dist_project_lib_DATA += shared/startup/linkcmds.armv4 dist_project_lib_DATA += shared/startup/linkcmds.armv7m @@ -18,6 +15,5 @@ EXTRA_DIST = EXTRA_DIST += shared/comm/uart.h EXTRA_DIST += shared/comm/uart.c -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am index 048cb50f00..edad93cdb0 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am +++ b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am @@ -11,60 +11,13 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp -include_bsp_socaldir = $(includedir)/bsp/socal - dist_project_lib_DATA = bsp_specs ############################################################################### # Header # ############################################################################### -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h - -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h - -include_bsp_HEADERS = -include_bsp_socal_HEADERS = - -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-clock.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-irq.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-regs.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-start.h -include_bsp_HEADERS += ../shared/include/arm-cp15-start.h -include_bsp_HEADERS += ../shared/include/arm-errata.h -include_bsp_HEADERS += ../shared/include/arm-gic.h -include_bsp_HEADERS += ../shared/include/arm-gic-irq.h -include_bsp_HEADERS += ../shared/include/arm-gic-regs.h -include_bsp_HEADERS += ../shared/include/arm-gic-tm27.h -include_bsp_HEADERS += ../shared/include/arm-release-id.h -include_bsp_HEADERS += include/irq.h - # Altera hwlib -include_bsp_HEADERS += hwlib/include/alt_16550_uart.h -include_bsp_HEADERS += hwlib/include/alt_address_space.h -include_bsp_HEADERS += hwlib/include/alt_cache.h -include_bsp_HEADERS += hwlib/include/alt_clock_group.h -include_bsp_HEADERS += hwlib/include/alt_clock_manager.h -include_bsp_HEADERS += hwlib/include/alt_dma_common.h -include_bsp_HEADERS += hwlib/include/alt_dma.h -include_bsp_HEADERS += hwlib/include/alt_dma_program.h -include_bsp_HEADERS += hwlib/include/alt_generalpurpose_io.h -include_bsp_HEADERS += hwlib/include/alt_hwlibs_ver.h -include_bsp_HEADERS += hwlib/include/alt_i2c.h -include_bsp_HEADERS += hwlib/include/alt_interrupt_common.h -include_bsp_HEADERS += hwlib/include/alt_mpu_registers.h -include_bsp_HEADERS += hwlib/include/alt_qspi_private.h -include_bsp_HEADERS += hwlib/include/alt_reset_manager.h -include_bsp_HEADERS += hwlib/include/hwlib.h #The following Altera hwlib header files have been left out because so far #they are not required: #include_bsp_HEADERS += hwlib/include/alt_bridge_manager.h @@ -77,22 +30,6 @@ include_bsp_HEADERS += hwlib/include/hwlib.h #include_bsp_HEADERS += hwlib/include/alt_interrupt.h # Some of the headers from hwlib need the files from socal. Install them. -include_bsp_socal_HEADERS += hwlib/include/socal/alt_acpidmap.h -include_bsp_socal_HEADERS += hwlib/include/socal/alt_clkmgr.h -include_bsp_socal_HEADERS += hwlib/include/socal/alt_dmanonsecure.h -include_bsp_socal_HEADERS += hwlib/include/socal/alt_dmasecure.h -include_bsp_socal_HEADERS += hwlib/include/socal/alt_gpio.h -include_bsp_socal_HEADERS += hwlib/include/socal/alt_i2c.h -include_bsp_socal_HEADERS += hwlib/include/socal/alt_l3.h -include_bsp_socal_HEADERS += hwlib/include/socal/alt_qspidata.h -include_bsp_socal_HEADERS += hwlib/include/socal/alt_qspi.h -include_bsp_socal_HEADERS += hwlib/include/socal/alt_rstmgr.h -include_bsp_socal_HEADERS += hwlib/include/socal/alt_sdr.h -include_bsp_socal_HEADERS += hwlib/include/socal/alt_sysmgr.h -include_bsp_socal_HEADERS += hwlib/include/socal/alt_uart.h -include_bsp_socal_HEADERS += hwlib/include/socal/hps.h -include_bsp_socal_HEADERS += hwlib/include/socal/socal.h - ############################################################################### # Data # ############################################################################### @@ -102,7 +39,6 @@ start.$(OBJEXT): ../shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -project_lib_DATA += startup/linkcmds project_lib_DATA += startup/linkcmds.altcycv project_lib_DATA += startup/linkcmds.altcycv_devkit project_lib_DATA += startup/linkcmds.altcycv_devkit_smp @@ -114,7 +50,7 @@ project_lib_DATA += startup/linkcmds.altcycv_devkit_smp noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) libbsp_a_LIBADD = # for the Altera hwlib @@ -191,8 +127,6 @@ libbsp_a_SOURCES += ../shared/arm-a9mpcore-clock-config.c # I2C libbsp_a_SOURCES += i2c/i2cdrv.c libbsp_a_SOURCES += i2c/i2cdrv-config.c -include_bsp_HEADERS += include/i2cdrv.h - # RTC libbsp_a_SOURCES += ../../shared/tod.c libbsp_a_SOURCES += rtc/rtc.c @@ -209,5 +143,4 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../shared/arm-l2c-310 DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac b/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac index 8d0ecad6e3..1d65920bab 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac +++ b/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac @@ -9,6 +9,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-xilinx-zynq-a9],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/altcycv_devkit.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -79,7 +81,6 @@ RTEMS_CHECK_SMP AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am index bc64530733..7945fa9200 100644 --- a/c/src/lib/libbsp/arm/atsam/Makefile.am +++ b/c/src/lib/libbsp/arm/atsam/Makefile.am @@ -16,7 +16,6 @@ start.$(OBJEXT): ../shared/start/start.S project_lib_DATA = start.$(OBJEXT) project_lib_DATA += startup/linkcmds -project_lib_DATA += startup/linkcmds.memory project_lib_DATA += startup/linkcmds.intsram project_lib_DATA += startup/linkcmds.sdram project_lib_DATA += startup/linkcmds.qspiflash @@ -25,302 +24,6 @@ project_lib_DATA += startup/linkcmds.qspiflash # Header # ############################################################################### -include_HEADERS = -include_HEADERS += include/tm27.h -include_HEADERS += ../shared/CMSIS/Include/core_cm7.h -include_HEADERS += ../shared/CMSIS/Include/core_cmInstr.h -include_HEADERS += ../shared/CMSIS/Include/core_cmFunc.h -include_HEADERS += ../shared/CMSIS/Include/core_cmSimd.h -include_HEADERS += ../shared/CMSIS/Include/cmsis_gcc.h -include_HEADERS += include/bsp.h - -nodist_include_HEADERS = -nodist_include_HEADERS += include/bspopts.h - -include_bspdir = $(includedir)/bsp - -nodist_include_bsp_HEADERS = -nodist_include_bsp_HEADERS += ../../shared/include/bootcard.h - -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += ../shared/armv7m/include/armv7m-irq.h -include_bsp_HEADERS += include/irq.h -include_bsp_HEADERS += include/pin-config.h -include_bsp_HEADERS += include/atsam-i2c.h -include_bsp_HEADERS += include/i2c.h -include_bsp_HEADERS += include/atsam-spi.h -include_bsp_HEADERS += include/spi.h -include_bsp_HEADERS += include/sc16is752.h -include_bsp_HEADERS += include/power.h -include_bsp_HEADERS += include/atsam-clock-config.h - -include_libchipdir = $(includedir)/libchip - -include_libchip_HEADERS = -include_libchip_HEADERS += libraries/libchip/chip.h -include_libchip_HEADERS += libraries/libchip/compiler.h - -include_libchip_includedir = $(includedir)/libchip/include - -include_libchip_include_HEADERS = -include_libchip_include_HEADERS += libraries/libchip/include/acc.h -include_libchip_include_HEADERS += libraries/libchip/include/adc.h -include_libchip_include_HEADERS += libraries/libchip/include/aes.h -include_libchip_include_HEADERS += libraries/libchip/include/afec.h -include_libchip_include_HEADERS += libraries/libchip/include/afe_dma.h -include_libchip_include_HEADERS += libraries/libchip/include/chip.h -include_libchip_include_HEADERS += libraries/libchip/include/dac_dma.h -include_libchip_include_HEADERS += libraries/libchip/include/efc.h -include_libchip_include_HEADERS += libraries/libchip/include/exceptions.h -include_libchip_include_HEADERS += libraries/libchip/include/flashd.h -include_libchip_include_HEADERS += libraries/libchip/include/gmacd.h -include_libchip_include_HEADERS += libraries/libchip/include/gmac.h -include_libchip_include_HEADERS += libraries/libchip/include/hsmci.h -include_libchip_include_HEADERS += libraries/libchip/include/icm.h -include_libchip_include_HEADERS += libraries/libchip/include/isi.h -include_libchip_include_HEADERS += libraries/libchip/include/iso7816_4.h -include_libchip_include_HEADERS += libraries/libchip/include/mcan.h -include_libchip_include_HEADERS += libraries/libchip/include/mcid.h -include_libchip_include_HEADERS += libraries/libchip/include/mediaLB.h -include_libchip_include_HEADERS += libraries/libchip/include/mpu.h -include_libchip_include_HEADERS += libraries/libchip/include/pio_capture.h -include_libchip_include_HEADERS += libraries/libchip/include/pio.h -include_libchip_include_HEADERS += libraries/libchip/include/pio_it.h -include_libchip_include_HEADERS += libraries/libchip/include/pmc.h -include_libchip_include_HEADERS += libraries/libchip/include/pwmc.h -include_libchip_include_HEADERS += libraries/libchip/include/qspi_dma.h -include_libchip_include_HEADERS += libraries/libchip/include/qspi.h -include_libchip_include_HEADERS += libraries/libchip/include/rstc.h -include_libchip_include_HEADERS += libraries/libchip/include/rtc.h -include_libchip_include_HEADERS += libraries/libchip/include/rtt.h -include_libchip_include_HEADERS += libraries/libchip/include/sdramc.h -include_libchip_include_HEADERS += libraries/libchip/include/smc.h -include_libchip_include_HEADERS += libraries/libchip/include/spi_dma.h -include_libchip_include_HEADERS += libraries/libchip/include/spi.h -include_libchip_include_HEADERS += libraries/libchip/include/ssc.h -include_libchip_include_HEADERS += libraries/libchip/include/supc.h -include_libchip_include_HEADERS += libraries/libchip/include/tc.h -include_libchip_include_HEADERS += libraries/libchip/include/timetick.h -include_libchip_include_HEADERS += libraries/libchip/include/trace.h -include_libchip_include_HEADERS += libraries/libchip/include/trng.h -include_libchip_include_HEADERS += libraries/libchip/include/twid.h -include_libchip_include_HEADERS += libraries/libchip/include/twi.h -include_libchip_include_HEADERS += libraries/libchip/include/uart_dma.h -include_libchip_include_HEADERS += libraries/libchip/include/uart.h -include_libchip_include_HEADERS += libraries/libchip/include/usart_dma.h -include_libchip_include_HEADERS += libraries/libchip/include/usart.h -include_libchip_include_HEADERS += libraries/libchip/include/usbhs.h -include_libchip_include_HEADERS += libraries/libchip/include/video.h -include_libchip_include_HEADERS += libraries/libchip/include/wdt.h -include_libchip_include_HEADERS += libraries/libchip/include/xdmac.h -include_libchip_include_HEADERS += libraries/libchip/include/xdmad.h -include_libchip_include_HEADERS += libraries/libchip/include/xdma_hardware_interface.h - -include_libchip_include_same70dir = $(includedir)/libchip/include/same70 - -include_libchip_include_same70_HEADERS = -include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70.h -include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70j19.h -include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70j20.h -include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70j21.h -include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70n19.h -include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70n20.h -include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70n21.h -include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70q19.h -include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70q20.h -include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70q21.h -include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/system_same70.h - -include_libchip_include_same70_componentdir = $(includedir)/libchip/include/same70/component - -include_libchip_include_same70_component_HEADERS = -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_acc.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_aes.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_afec.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_chipid.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_dacc.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_efc.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_gmac.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_gpbr.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_hsmci.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_icm.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_isi.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_matrix.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_mcan.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_pio.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_pmc.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_pwm.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_qspi.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_rstc.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_rswdt.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_rtc.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_rtt.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_sdramc.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_smc.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_spi.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_ssc.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_supc.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_tc.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_trng.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_twihs.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_uart.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_usart.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_usbhs.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_utmi.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_wdt.h -include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_xdmac.h - -include_libchip_include_same70_piodir = $(includedir)/libchip/include/same70/pio - -include_libchip_include_same70_pio_HEADERS = -include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70j19.h -include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70j20.h -include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70j21.h -include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70n19.h -include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70n20.h -include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70n21.h -include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70q19.h -include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70q20.h -include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70q21.h - -include_libchip_include_sams70dir = $(includedir)/libchip/include/sams70 - -include_libchip_include_sams70_HEADERS = -include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70.h -include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70j19.h -include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70j20.h -include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70j21.h -include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70n19.h -include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70n20.h -include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70n21.h -include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70q19.h -include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70q20.h -include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70q21.h -include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/system_sams70.h - -include_libchip_include_sams70_componentdir = $(includedir)/libchip/include/sams70/component - -include_libchip_include_sams70_component_HEADERS = -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_acc.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_aes.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_afec.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_chipid.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_dacc.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_efc.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_gpbr.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_hsmci.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_icm.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_isi.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_matrix.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_pio.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_pmc.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_pwm.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_qspi.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_rstc.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_rswdt.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_rtc.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_rtt.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_sdramc.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_smc.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_spi.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_ssc.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_supc.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_tc.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_trng.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_twihs.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_uart.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_usart.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_usbhs.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_utmi.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_wdt.h -include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_xdmac.h - -include_libchip_include_sams70_piodir = $(includedir)/libchip/include/sams70/pio - -include_libchip_include_sams70_pio_HEADERS = -include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70j19.h -include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70j20.h -include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70j21.h -include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70n19.h -include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70n20.h -include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70n21.h -include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70q19.h -include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70q20.h -include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70q21.h - -include_libchip_include_samv71dir = $(includedir)/libchip/include/samv71 - -include_libchip_include_samv71_HEADERS = -include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71.h -include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71j19.h -include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71j20.h -include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71j21.h -include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71n19.h -include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71n20.h -include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71n21.h -include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71q19.h -include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71q20.h -include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71q21.h -include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/system_samv71.h - -include_libchip_include_samv71_componentdir = $(includedir)/libchip/include/samv71/component - -include_libchip_include_samv71_component_HEADERS = -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_acc.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_aes.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_afec.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_chipid.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_dacc.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_efc.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_gmac.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_gpbr.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_hsmci.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_icm.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_isi.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_matrix.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_mcan.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_mlb.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_pio.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_pmc.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_pwm.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_qspi.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_rstc.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_rswdt.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_rtc.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_rtt.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_sdramc.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_smc.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_spi.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_ssc.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_supc.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_tc.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_trng.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_twihs.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_uart.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_usart.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_usbhs.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_utmi.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_wdt.h -include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_xdmac.h - -include_libchip_include_samv71_piodir = $(includedir)/libchip/include/samv71/pio - -include_libchip_include_samv71_pio_HEADERS = -include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71j19.h -include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71j20.h -include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71j21.h -include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71n19.h -include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71n20.h -include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71n21.h -include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71q19.h -include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71q20.h -include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71q21.h - ############################################################################### # LibBSP # ############################################################################### @@ -328,7 +31,7 @@ include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/p noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) libbsp_a_LIBADD = # Shared @@ -467,5 +170,4 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/libraries/libchip/include DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/atsam/configure.ac b/c/src/lib/libbsp/arm/atsam/configure.ac index 9a688596a9..219aca7ff7 100644 --- a/c/src/lib/libbsp/arm/atsam/configure.ac +++ b/c/src/lib/libbsp/arm/atsam/configure.ac @@ -2,6 +2,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-atsam],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/atsamv.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am index 38ac88d108..69edb77281 100644 --- a/c/src/lib/libbsp/arm/beagle/Makefile.am +++ b/c/src/lib/libbsp/arm/beagle/Makefile.am @@ -11,44 +11,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp -include_libcpudir = $(includedir)/libcpu - dist_project_lib_DATA = bsp_specs ############################################################################### # Header # ############################################################################### -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h - -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h - -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../../shared/include/uart-output-char.h -include_bsp_HEADERS += ../shared/include/arm-a8core-start.h -include_bsp_HEADERS += ../shared/include/arm-cp15-start.h -include_bsp_HEADERS += ../shared/include/arm-errata.h -include_bsp_HEADERS += ../shared/include/arm-release-id.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += include/irq.h -include_bsp_HEADERS += include/i2c.h -include_bsp_HEADERS += include/beagleboneblack.h -include_bsp_HEADERS += include/bbb-gpio.h -include_bsp_HEADERS += include/bbb-pwm.h - -include_libcpu_HEADERS = -include_libcpu_HEADERS += ../../../libcpu/arm/shared/include/omap3.h -include_libcpu_HEADERS += ../../../libcpu/arm/shared/include/am335x.h -include_libcpu_HEADERS += ../../../libcpu/arm/shared/include/omap_timer.h - ############################################################################### # Data # ############################################################################### @@ -58,7 +26,6 @@ start.$(OBJEXT): ../shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -project_lib_DATA += startup/linkcmds project_lib_DATA += startup/linkcmds.beagle EXTRA_DIST += startup/linkcmds.beagle @@ -70,7 +37,7 @@ EXTRA_DIST += startup/linkcmds.beagle noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) libbsp_a_LIBADD = # Shared @@ -142,5 +109,4 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../shared/armv467ar-basic-cache DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/beagle/configure.ac b/c/src/lib/libbsp/arm/beagle/configure.ac index 1dcada5eee..55b5720c69 100644 --- a/c/src/lib/libbsp/arm/beagle/configure.ac +++ b/c/src/lib/libbsp/arm/beagle/configure.ac @@ -9,6 +9,8 @@ AC_PREREQ([2.68]) AC_INIT([rtems-c-src-lib-libbsp-arm-beagle],[_RTEMS_VERSION],[rtems-bugs@rtems.com]) AC_CONFIG_SRCDIR([make/custom/beagleboardorig.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.11.1]) @@ -46,7 +48,6 @@ RTEMS_BSPOPTS_SET([BBB_DEBUG],[beaglebone*],[0]) RTEMS_BSPOPTS_HELP([BBB_DEBUG],[Enable BBB debug]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/arm/configure.ac b/c/src/lib/libbsp/arm/configure.ac index 35de7a729e..285cd3156f 100644 --- a/c/src/lib/libbsp/arm/configure.ac +++ b/c/src/lib/libbsp/arm/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([../arm]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am index 12cab14fa8..b8ac7a2d74 100644 --- a/c/src/lib/libbsp/arm/csb336/Makefile.am +++ b/c/src/lib/libbsp/arm/csb336/Makefile.am @@ -4,19 +4,10 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_HEADERS += include/mc9328mxl.h - -include_bsp_HEADERS = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -45,9 +36,6 @@ libbsp_a_SOURCES += timer/timer.c # console libbsp_a_SOURCES += console/uart.c # IRQ -include_bsp_HEADERS += ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h -include_bsp_HEADERS += include/bsp/irq.h libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c libbsp_a_SOURCES += ../../shared/src/irq-generic.c libbsp_a_SOURCES += ../../shared/src/irq-info.c @@ -76,5 +64,4 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/csb336/configure.ac b/c/src/lib/libbsp/arm/csb336/configure.ac index bbdf556328..aa5c2c2c07 100644 --- a/c/src/lib/libbsp/arm/csb336/configure.ac +++ b/c/src/lib/libbsp/arm/csb336/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-csb336],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/csb336.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am index 6999c0250e..36854eeaf7 100644 --- a/c/src/lib/libbsp/arm/csb337/Makefile.am +++ b/c/src/lib/libbsp/arm/csb337/Makefile.am @@ -4,47 +4,21 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_HEADERS += include/at91rm9200_dbgu.h -include_HEADERS += include/at91rm9200_emac.h -include_HEADERS += include/at91rm9200_gpio.h -include_HEADERS += include/at91rm9200.h -include_HEADERS += include/at91rm9200_mem.h -include_HEADERS += include/at91rm9200_pmc.h -include_HEADERS += include/at91rm9200_usart.h -include_HEADERS += include/bits.h - if ENABLE_LCD -include_HEADERS += include/sed1356.h endif -include_bsp_HEADERS = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) if ENABLE_UMON -include_umondir = $(includedir)/umon -include_umon_HEADERS = ../../shared/umon/cli.h -include_umon_HEADERS += ../../shared/umon/monlib.h -include_umon_HEADERS += ../../shared/umon/tfs.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = ../../shared/umon/umon.h endif -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = if ENABLE_LCD -nodist_include_HEADERS += console/sed1356_16bit.h -nodist_include_HEADERS += console/font8x16.h endif EXTRA_DIST += start/start.S @@ -52,7 +26,6 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -project_lib_DATA += startup/linkcmds EXTRA_DIST += startup/linkcmds.csb337 EXTRA_DIST += startup/linkcmds.csb637 EXTRA_DIST += README @@ -80,9 +53,6 @@ libbsp_a_SOURCES += ../../shared/console.c console/uarts.c \ libbsp_a_SOURCES += console/dbgu.c libbsp_a_SOURCES += console/usart.c # IRQ -include_bsp_HEADERS += ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h -include_bsp_HEADERS += include/bsp/irq.h libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c libbsp_a_SOURCES += ../../shared/src/irq-generic.c libbsp_a_SOURCES += ../../shared/src/irq-info.c @@ -122,5 +92,4 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/csb337/configure.ac b/c/src/lib/libbsp/arm/csb337/configure.ac index 5567bf06f4..f5b9e3418f 100644 --- a/c/src/lib/libbsp/arm/csb337/configure.ac +++ b/c/src/lib/libbsp/arm/csb337/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-csb337],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/csb337.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -63,7 +65,6 @@ RTEMS_BSPOPTS_HELP([ENABLE_USART3], AM_CONDITIONAL(ENABLE_USART3,test "$ENABLE_USART3" = "1") RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am index 6cb4af3cc9..76bc29d44f 100644 --- a/c/src/lib/libbsp/arm/edb7312/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am @@ -4,22 +4,11 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -include_bsp_HEADERS = - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/ep7312.h - EXTRA_DIST += start/start.S start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< @@ -30,7 +19,6 @@ dist_project_lib_DATA += startup/linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -include_HEADERS += ../../arm/shared/comm/uart.h # startup libbsp_a_SOURCES += \ ../../shared/bspgetworkarea.c \ @@ -52,9 +40,6 @@ libbsp_a_SOURCES += console/uart.c ../../shared/console.c \ libbsp_a_SOURCES += timer/timer.c # irq -include_bsp_HEADERS += ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h \ - irq/irq.h libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c libbsp_a_SOURCES += ../../shared/src/irq-generic.c libbsp_a_SOURCES += ../../shared/src/irq-info.c @@ -83,5 +68,4 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/edb7312/configure.ac b/c/src/lib/libbsp/arm/edb7312/configure.ac index 8c8614acef..b069e6bb86 100644 --- a/c/src/lib/libbsp/arm/edb7312/configure.ac +++ b/c/src/lib/libbsp/arm/edb7312/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-edb7312],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/edb7312.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am index 8ed842ebba..24caf87243 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am +++ b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am @@ -4,21 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_bsp_HEADERS = include/irq.h -include_bsp_HEADERS += include/swi.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -78,5 +65,4 @@ libbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c libbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/gdbarmsim/configure.ac b/c/src/lib/libbsp/arm/gdbarmsim/configure.ac index 5733553126..c3c17b7db0 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/configure.ac +++ b/c/src/lib/libbsp/arm/gdbarmsim/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-gdbarmsim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/arm1136jfs.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am index 5fb8d708bf..468c4da072 100644 --- a/c/src/lib/libbsp/arm/gumstix/Makefile.am +++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am @@ -4,19 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_HEADERS += include/pxa255.h -include_HEADERS += include/ffuart.h - -include_bsp_HEADERS = - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -48,9 +37,6 @@ libbsp_a_SOURCES += console/uarts.c ../../shared/console.c \ ../../shared/console_read.c ../../shared/console_write.c libbsp_a_SOURCES += console/ffuart.c # IRQ -include_bsp_HEADERS += ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h -include_bsp_HEADERS += include/bsp/irq.h libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c libbsp_a_SOURCES += ../../shared/src/irq-generic.c libbsp_a_SOURCES += ../../shared/src/irq-info.c @@ -84,5 +70,4 @@ libbsp_a_LIBADD += rtl8019.rel endif endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/gumstix/configure.ac b/c/src/lib/libbsp/arm/gumstix/configure.ac index 037990be57..dfe3d8aab3 100644 --- a/c/src/lib/libbsp/arm/gumstix/configure.ac +++ b/c/src/lib/libbsp/arm/gumstix/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-gumstix],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/gumstix.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am b/c/src/lib/libbsp/arm/imx/Makefile.am index 9addb13bc5..981bebf19d 100644 --- a/c/src/lib/libbsp/arm/imx/Makefile.am +++ b/c/src/lib/libbsp/arm/imx/Makefile.am @@ -4,50 +4,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp -include_arm_freescale_imxdir = $(includedir)/arm/freescale/imx - dist_project_lib_DATA = bsp_specs ############################################################################### # Header # ############################################################################### -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h - -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h - -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-regs.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-start.h -include_bsp_HEADERS += ../shared/include/arm-cp15-start.h -include_bsp_HEADERS += ../shared/include/arm-errata.h -include_bsp_HEADERS += ../shared/include/arm-gic.h -include_bsp_HEADERS += ../shared/include/arm-gic-irq.h -include_bsp_HEADERS += ../shared/include/arm-gic-regs.h -include_bsp_HEADERS += ../shared/include/arm-gic-tm27.h -include_bsp_HEADERS += ../shared/include/arm-release-id.h -include_bsp_HEADERS += include/irq.h - -include_arm_freescale_imx_HEADERS = -include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_ccmvar.h -include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_ecspireg.h -include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_gpcreg.h -include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_i2creg.h -include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_iomuxreg.h -include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_iomuxvar.h -include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_srcreg.h -include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_uartreg.h -include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_wdogreg.h - ############################################################################### # Data # ############################################################################### @@ -57,7 +19,6 @@ start.$(OBJEXT): ../shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -project_lib_DATA += startup/linkcmds project_lib_DATA += startup/linkcmds.imx7 ############################################################################### @@ -67,7 +28,7 @@ project_lib_DATA += startup/linkcmds.imx7 noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) libbsp_a_LIBADD = # Shared @@ -134,5 +95,4 @@ libbsp_a_SOURCES += startup/bspstarthooks.c DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/imx/configure.ac b/c/src/lib/libbsp/arm/imx/configure.ac index bb29efd64e..e39f713158 100644 --- a/c/src/lib/libbsp/arm/imx/configure.ac +++ b/c/src/lib/libbsp/arm/imx/configure.ac @@ -2,6 +2,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-imx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/imx7.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -58,7 +60,6 @@ RTEMS_CHECK_SMP AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am index 6b950c27ab..522dfe828d 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am @@ -4,8 +4,6 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - ############################################################################### # Data # ############################################################################### @@ -17,7 +15,6 @@ start.$(OBJEXT): ../shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -project_lib_DATA += startup/linkcmds EXTRA_DIST += startup/linkcmds.lm3s6965 startup/linkcmds.lm3s6965_qemu startup/linkcmds.lm3s3749 @@ -25,30 +22,6 @@ EXTRA_DIST += startup/linkcmds.lm3s6965 startup/linkcmds.lm3s6965_qemu startup/l # Header # ############################################################################### -include_HEADERS = -include_HEADERS += include/tm27.h -include_HEADERS += include/bsp.h - -nodist_include_HEADERS = -nodist_include_HEADERS += include/bspopts.h - -nodist_include_bsp_HEADERS = -nodist_include_bsp_HEADERS += ../../shared/include/bootcard.h - -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += ../shared/armv7m/include/armv7m-irq.h -include_bsp_HEADERS += include/irq.h -include_bsp_HEADERS += include/uart.h -include_bsp_HEADERS += include/io.h -include_bsp_HEADERS += include/syscon.h -include_bsp_HEADERS += include/ssi.h -include_bsp_HEADERS += include/lm3s69xx.h - ############################################################################### # LibBSP # ############################################################################### @@ -56,7 +29,7 @@ include_bsp_HEADERS += include/lm3s69xx.h noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) libbsp_a_LIBADD = # Shared @@ -119,5 +92,4 @@ libbsp_a_SOURCES += ssi/ssi.c DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/lm3s69xx/configure.ac b/c/src/lib/libbsp/arm/lm3s69xx/configure.ac index a373e2557c..3a8e101445 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/configure.ac +++ b/c/src/lib/libbsp/arm/lm3s69xx/configure.ac @@ -9,6 +9,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-lm3s69xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/lm3s3749.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -75,7 +77,6 @@ RTEMS_BSPOPTS_SET([LM3S69XX_MCU_LM4F120],[lm4f120*],[1]) RTEMS_BSPOPTS_HELP([LM3S69XX_MCU_LM4F120],[board has LM4F120xxx MCU]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am index 4e2d98bfbf..e1e5a84e7f 100644 --- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am @@ -11,8 +11,6 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs @@ -20,47 +18,6 @@ dist_project_lib_DATA = bsp_specs # ------ Headers # ---------------------------- -include_HEADERS = include/bsp.h - -nodist_include_HEADERS = include/bspopts.h - -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h - -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../../shared/include/uart-output-char.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h -include_bsp_HEADERS += ../shared/lpc/include/lpc-i2s.h -include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.h -include_bsp_HEADERS += ../shared/armv7m/include/armv7m-irq.h -include_bsp_HEADERS += include/dma.h -include_bsp_HEADERS += include/io-defs.h -include_bsp_HEADERS += include/io.h -include_bsp_HEADERS += include/common-types.h -include_bsp_HEADERS += include/gpio-defs.h -include_bsp_HEADERS += include/lpc-gpio.h -include_bsp_HEADERS += include/can.h -include_bsp_HEADERS += include/can-defs.h -include_bsp_HEADERS += include/pwmout.h -include_bsp_HEADERS += include/pwmout-defs.h -include_bsp_HEADERS += include/adc.h -include_bsp_HEADERS += include/adc-defs.h -include_bsp_HEADERS += include/timer-defs.h -include_bsp_HEADERS += include/timer.h -include_bsp_HEADERS += include/watchdog.h -include_bsp_HEADERS += include/watchdog-defs.h -include_bsp_HEADERS += include/irq.h -include_bsp_HEADERS += include/lpc176x.h -include_bsp_HEADERS += include/lpc-clock-config.h -include_bsp_HEADERS += include/system-clocks.h -include_bsp_HEADERS += include/mbed-pinmap.h - -include_HEADERS += include/tm27.h - # ---------------------------- # ------ Data @@ -70,7 +27,6 @@ EXTRA_DIST += ../shared/start/start.S start.$(OBJEXT): ../shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -project_lib_DATA += startup/linkcmds EXTRA_DIST += startup/linkcmds.lpc1768_mbed EXTRA_DIST += startup/linkcmds.lpc1768_mbed_ahb_ram @@ -84,7 +40,7 @@ EXTRA_DIST += startup/linkcmds.lpc1768_mbed_ahb_ram_eth noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) libbsp_a_LIBADD = # Shared @@ -172,5 +128,4 @@ libbsp_a_SOURCES += startup/bspstarthooks.c DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/lpc176x/configure.ac b/c/src/lib/libbsp/arm/lpc176x/configure.ac index dae4322987..50ac73bc59 100644 --- a/c/src/lib/libbsp/arm/lpc176x/configure.ac +++ b/c/src/lib/libbsp/arm/lpc176x/configure.ac @@ -10,6 +10,8 @@ AC_INIT([rtems-c-src-lib-libbsp-arm-lpc176x],[_RTEMS_VERSION], [https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/lpc1768_mbed_ahb_ram.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -68,7 +70,6 @@ RTEMS_BSPOPTS_SET([LPC_DMA_CHANNEL_COUNT],[*],[2]) RTEMS_BSPOPTS_HELP([LPC_DMA_CHANNEL_COUNT],[DMA channel count]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index 1473a7bc56..a38d352923 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -11,50 +11,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs ############################################################################### # Header # ############################################################################### -include_HEADERS = include/bsp.h - -nodist_include_HEADERS = include/bspopts.h - -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h - -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../../shared/include/uart-output-char.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += ../shared/include/arm-pl111-fb.h -include_bsp_HEADERS += ../shared/include/arm-pl111-regs.h -include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h -include_bsp_HEADERS += ../shared/lpc/include/lpc-i2s.h -include_bsp_HEADERS += ../shared/lpc/include/lpc-emc.h -include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.h -include_bsp_HEADERS += ../shared/lpc/include/lpc-lcd.h -include_bsp_HEADERS += ../shared/armv7m/include/armv7m-irq.h -include_bsp_HEADERS += include/dma.h -include_bsp_HEADERS += include/i2c.h -include_bsp_HEADERS += include/io.h -include_bsp_HEADERS += include/irq.h -include_bsp_HEADERS += include/lcd.h -include_bsp_HEADERS += include/lpc17xx.h -include_bsp_HEADERS += include/lpc24xx.h -include_bsp_HEADERS += include/lpc-clock-config.h -include_bsp_HEADERS += include/lpc-ethernet-config.h -include_bsp_HEADERS += include/ssp.h -include_bsp_HEADERS += include/start-config.h -include_bsp_HEADERS += include/system-clocks.h - -include_HEADERS += include/tm27.h - ############################################################################### # Data # ############################################################################### @@ -64,7 +26,6 @@ start.$(OBJEXT): ../shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -project_lib_DATA += startup/linkcmds project_lib_DATA += startup/linkcmds.lpc17xx_ea_ram project_lib_DATA += startup/linkcmds.lpc17xx_ea_rom_int project_lib_DATA += startup/linkcmds.lpc17xx_plx800_ram @@ -87,7 +48,7 @@ project_lib_DATA += startup/linkcmds.lpc40xx_ea_rom_int noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) libbsp_a_LIBADD = # Shared @@ -192,5 +153,4 @@ endif DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/lpc24xx/configure.ac b/c/src/lib/libbsp/arm/lpc24xx/configure.ac index 14c242c790..20752b1093 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/configure.ac +++ b/c/src/lib/libbsp/arm/lpc24xx/configure.ac @@ -9,6 +9,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-lpc24xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/lpc17xx_ea_ram.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -123,7 +125,6 @@ RTEMS_BSPOPTS_SET([BSP_USB_OTG_TRANSCEIVER_I2C_ADDR],[lpc17xx_ea* | lpc40xx_ea*] RTEMS_BSPOPTS_HELP([BSP_USB_OTG_TRANSCEIVER_I2C_ADDR],[USB OTG transceiver I2C address used by USB stack]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am index df6353da88..b99fb9b22c 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am @@ -11,47 +11,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs ############################################################################### # Header # ############################################################################### -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h - -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h - -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../../shared/include/uart-output-char.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += ../shared/include/arm-cp15-start.h -include_bsp_HEADERS += ../shared/include/arm-errata.h -include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h -include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.h -include_bsp_HEADERS += ../shared/lpc/include/lpc-i2s.h -include_bsp_HEADERS += ../shared/lpc/include/lpc-emc.h -include_bsp_HEADERS += ../shared/lpc/include/lpc-lcd.h -include_bsp_HEADERS += ../shared/include/arm-release-id.h -include_bsp_HEADERS += include/irq.h -include_bsp_HEADERS += include/mmu.h -include_bsp_HEADERS += include/lpc32xx.h -include_bsp_HEADERS += include/lpc-clock-config.h -include_bsp_HEADERS += include/lpc-ethernet-config.h -include_bsp_HEADERS += include/nand-mlc.h -include_bsp_HEADERS += include/boot.h -include_bsp_HEADERS += include/hsu.h -include_bsp_HEADERS += include/i2c.h -include_bsp_HEADERS += include/emc.h - ############################################################################### # Data # ############################################################################### @@ -61,7 +26,6 @@ start.$(OBJEXT): ../shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -project_lib_DATA += startup/linkcmds project_lib_DATA += startup/linkcmds.lpc32xx EXTRA_DIST += startup/linkcmds.lpc32xx_phycore \ @@ -76,7 +40,7 @@ EXTRA_DIST += startup/linkcmds.lpc32xx_phycore \ noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) libbsp_a_LIBADD = # Shared @@ -170,5 +134,4 @@ endif DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/lpc32xx/configure.ac b/c/src/lib/libbsp/arm/lpc32xx/configure.ac index 553d1ce314..3c876cdd91 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/configure.ac +++ b/c/src/lib/libbsp/arm/lpc32xx/configure.ac @@ -9,6 +9,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-lpc32xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/lpc32xx_mzx.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -106,7 +108,6 @@ RTEMS_BSPOPTS_SET([TESTS_USE_PRINTK],[*],[1]) RTEMS_BSPOPTS_HELP([TESTS_USE_PRINTK],[tests use printk() for output]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am index 8ed1aac5be..08bcdcdf4b 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am +++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am @@ -11,50 +11,14 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs ############################################################################### # Header # ############################################################################### -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h - -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h - noinst_HEADERS = console/font_data.h -include_bsp_HEADERS = -include_bsp_HEADERS += ../../../libbsp/shared/include/mm.h -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../../shared/include/uart-output-char.h -include_bsp_HEADERS += ../../shared/include/gpio.h -include_bsp_HEADERS += ../shared/include/linker-symbols.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += ../shared/include/arm-cp15-start.h -include_bsp_HEADERS += ../shared/include/arm-errata.h -include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h -include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.h -include_bsp_HEADERS += ../shared/include/arm-release-id.h -include_bsp_HEADERS += include/irq.h -include_bsp_HEADERS += include/mmu.h -include_bsp_HEADERS += include/usart.h -include_bsp_HEADERS += include/raspberrypi.h -include_bsp_HEADERS += include/rpi-gpio.h -include_bsp_HEADERS += include/i2c.h -include_bsp_HEADERS += include/spi.h -include_bsp_HEADERS += include/mailbox.h -include_bsp_HEADERS += include/vc.h -include_bsp_HEADERS += include/rpi-fb.h -include_bsp_HEADERS += console/fbcons.h - ############################################################################### # Data # ############################################################################### @@ -64,7 +28,6 @@ start.$(OBJEXT): ../shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -project_lib_DATA += startup/linkcmds project_lib_DATA += ../shared/startup/linkcmds.base ############################################################################### @@ -74,7 +37,7 @@ project_lib_DATA += ../shared/startup/linkcmds.base noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) libbsp_a_LIBADD = # Shared @@ -188,5 +151,4 @@ libbsp_a_SOURCES += ../shared/mminit.c DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/raspberrypi/configure.ac b/c/src/lib/libbsp/arm/raspberrypi/configure.ac index 6d771a4a0c..2c1d1c8ceb 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/configure.ac +++ b/c/src/lib/libbsp/arm/raspberrypi/configure.ac @@ -9,6 +9,8 @@ AC_PREREQ([2.68]) AC_INIT([rtems-c-src-lib-libbsp-arm-raspberrypi],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/raspberrypi.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am index 9cd72c37ab..e4282d3d19 100644 --- a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am +++ b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am @@ -11,46 +11,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs ############################################################################### # Header # ############################################################################### -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h - -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h - -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-clock.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-irq.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-regs.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-start.h -include_bsp_HEADERS += ../shared/include/arm-cp15-start.h -include_bsp_HEADERS += ../shared/include/arm-errata.h -include_bsp_HEADERS += ../shared/include/arm-gic.h -include_bsp_HEADERS += ../shared/include/arm-gic-irq.h -include_bsp_HEADERS += ../shared/include/arm-gic-regs.h -include_bsp_HEADERS += ../shared/include/arm-gic-tm27.h -include_bsp_HEADERS += ../shared/include/arm-pl011.h -include_bsp_HEADERS += ../shared/include/arm-pl011-regs.h -include_bsp_HEADERS += ../shared/include/arm-pl050.h -include_bsp_HEADERS += ../shared/include/arm-pl050-regs.h -include_bsp_HEADERS += ../shared/include/arm-pl111-fb.h -include_bsp_HEADERS += ../shared/include/arm-pl111-regs.h -include_bsp_HEADERS += ../shared/include/arm-release-id.h -include_bsp_HEADERS += include/irq.h - ############################################################################### # Data # ############################################################################### @@ -60,7 +26,6 @@ start.$(OBJEXT): ../shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -project_lib_DATA += startup/linkcmds project_lib_DATA += startup/linkcmds.realview_pbx_a9_qemu project_lib_DATA += startup/linkcmds.realview_pbx_a9_qemu_smp @@ -71,7 +36,7 @@ project_lib_DATA += startup/linkcmds.realview_pbx_a9_qemu_smp noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) libbsp_a_LIBADD = # Shared @@ -137,5 +102,4 @@ libbsp_a_SOURCES += startup/fb-config.c DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac b/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac index f01e216bdf..3bd8e95171 100644 --- a/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac +++ b/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac @@ -9,6 +9,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-realview-bpx-a9],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/realview_pbx_a9_qemu.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -50,7 +52,6 @@ RTEMS_CHECK_SMP AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am index 8be245e6a5..b8f68721c6 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am +++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am @@ -4,18 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_HEADERS += include/lpc22xx.h - -include_bsp_HEADERS = - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -31,7 +21,6 @@ dist_project_lib_DATA += startup/linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -include_HEADERS += ../../arm/shared/comm/uart.h # startup libbsp_a_SOURCES += \ ../../shared/bsppredriverhook.c \ @@ -49,9 +38,6 @@ libbsp_a_SOURCES += ../../shared/console.c \ ../../shared/console_select.c ../../shared/console_control.c \ ../../shared/console_read.c ../../shared/console_write.c # IRQ -include_bsp_HEADERS += ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h -include_bsp_HEADERS += include/bsp/irq.h libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c libbsp_a_SOURCES += ../../shared/src/irq-generic.c libbsp_a_SOURCES += ../../shared/src/irq-info.c @@ -80,5 +66,4 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/rtl22xx/configure.ac b/c/src/lib/libbsp/arm/rtl22xx/configure.ac index 950d22f0f9..fd3d186df1 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/configure.ac +++ b/c/src/lib/libbsp/arm/rtl22xx/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-rtl22xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/rtl22xx.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am index 1fe3780e2a..c16b4377e7 100644 --- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am +++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am @@ -4,22 +4,10 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += smc/smc.h -include_HEADERS += include/tm27.h -include_HEADERS += include/s3c24xx.h -include_HEADERS += include/s3c2400.h -include_HEADERS += include/s3c2410.h - -include_bsp_HEADERS = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h EXTRA_DIST += start/start.S @@ -58,9 +46,6 @@ libbsp_a_SOURCES += ../../shared/console_read.c libbsp_a_SOURCES += ../../shared/console_write.c libbsp_a_SOURCES += ../../shared/console_control.c # IRQ -include_bsp_HEADERS += ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h -include_bsp_HEADERS += include/bsp/irq.h libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c libbsp_a_SOURCES += ../../shared/src/irq-generic.c libbsp_a_SOURCES += ../../shared/src/irq-info.c @@ -80,5 +65,4 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../shared/armv467ar-basic-cache libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/smdk2410/configure.ac b/c/src/lib/libbsp/arm/smdk2410/configure.ac index 7328ecb44c..5cb0a89283 100644 --- a/c/src/lib/libbsp/arm/smdk2410/configure.ac +++ b/c/src/lib/libbsp/arm/smdk2410/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-smdk2410],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/smdk2410.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/arm/stm32f4/Makefile.am b/c/src/lib/libbsp/arm/stm32f4/Makefile.am index b2e4544314..ddbc9d9631 100644 --- a/c/src/lib/libbsp/arm/stm32f4/Makefile.am +++ b/c/src/lib/libbsp/arm/stm32f4/Makefile.am @@ -4,8 +4,6 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - ############################################################################### # Data # ############################################################################### @@ -17,7 +15,6 @@ start.$(OBJEXT): ../shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -project_lib_DATA += startup/linkcmds EXTRA_DIST += startup/linkcmds.stm32f4 EXTRA_DIST += startup/linkcmds.stm32f105rc @@ -26,44 +23,6 @@ EXTRA_DIST += startup/linkcmds.stm32f105rc # Header # ############################################################################### -include_HEADERS = -include_HEADERS += include/tm27.h -include_HEADERS += include/bsp.h - -nodist_include_HEADERS = -nodist_include_HEADERS += include/bspopts.h - -nodist_include_bsp_HEADERS = -nodist_include_bsp_HEADERS += ../../shared/include/bootcard.h - -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += ../shared/armv7m/include/armv7m-irq.h -include_bsp_HEADERS += include/irq.h -include_bsp_HEADERS += include/usart.h -include_bsp_HEADERS += include/stm32f4.h -include_bsp_HEADERS += include/stm32f10xxx_gpio.h -include_bsp_HEADERS += include/stm32f10xxx_rcc.h -include_bsp_HEADERS += include/stm32f10xxx_exti.h -include_bsp_HEADERS += include/stm32f4xxxx_adc.h -include_bsp_HEADERS += include/stm32f4xxxx_exti.h -include_bsp_HEADERS += include/stm32f4xxxx_gpio.h -include_bsp_HEADERS += include/stm32f4xxxx_rcc.h -include_bsp_HEADERS += include/stm32f4xxxx_pwr.h -include_bsp_HEADERS += include/stm32f4xxxx_syscfg.h -include_bsp_HEADERS += include/stm32f4xxxx_tim.h -include_bsp_HEADERS += include/stm32f4xxxx_flash.h -include_bsp_HEADERS += include/stm32f4xxxx_otgfs.h -include_bsp_HEADERS += include/stm32_i2c.h -include_bsp_HEADERS += include/i2c.h -include_bsp_HEADERS += include/stm32_usart.h -include_bsp_HEADERS += include/io.h -include_bsp_HEADERS += include/rcc.h - ############################################################################### # LibBSP # ############################################################################### @@ -71,7 +30,7 @@ include_bsp_HEADERS += include/rcc.h noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) libbsp_a_LIBADD = # Shared @@ -136,5 +95,4 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../../../libcpu/arm/shared/include DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/stm32f4/configure.ac b/c/src/lib/libbsp/arm/stm32f4/configure.ac index 4bf5871765..21179f6e7c 100644 --- a/c/src/lib/libbsp/arm/stm32f4/configure.ac +++ b/c/src/lib/libbsp/arm/stm32f4/configure.ac @@ -2,6 +2,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-stm32f4],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/stm32f4.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -68,7 +70,6 @@ RTEMS_BSPOPTS_SET([STM32F4_ENABLE_I2C2],[*],[]) RTEMS_BSPOPTS_HELP([STM32F4_ENABLE_I2C2],[enable I2C 2]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/arm/tms570/Makefile.am b/c/src/lib/libbsp/arm/tms570/Makefile.am index 000e9ff44f..7fd77dff36 100644 --- a/c/src/lib/libbsp/arm/tms570/Makefile.am +++ b/c/src/lib/libbsp/arm/tms570/Makefile.am @@ -11,82 +11,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - -include_bsp_ti_herculesdir = $(includedir)/bsp/ti_herc - dist_project_lib_DATA = bsp_specs # ---------------------------- # ------ Headers # ---------------------------- -include_HEADERS = include/bsp.h - -nodist_include_HEADERS = include/bspopts.h - -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h - -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../../shared/include/uart-output-char.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += include/tms570.h -include_bsp_HEADERS += include/tms570-sci.h -include_bsp_HEADERS += include/irq.h -include_bsp_HEADERS += include/tms570-rti.h -include_bsp_HEADERS += include/tms570-vim.h -include_bsp_HEADERS += include/tms570-pom.h -include_bsp_HEADERS += include/tms570-sci-driver.h -include_bsp_HEADERS += include/system-clocks.h -include_bsp_HEADERS += include/tms570-pinmux.h - -include_bsp_HEADERS += include/tms570-pins.h -include_bsp_HEADERS += include/tms570ls3137zwt-pins.h -include_bsp_HEADERS += include/tms570lc4357-pins.h - -include_bsp_ti_hercules_HEADERS = include/ti_herc/reg_adc.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_ccmsr.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_crc.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dcan.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dcc.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dma.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dmm.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_efuse.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_emacc.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_emacm.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_emif.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_esm.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_flash.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_flex_ray.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_gio.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_htu.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_i2c.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_iomm.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_lin.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_mdio.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_n2het.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pbist.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pll.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pmm.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_rti.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_rtp.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_sci.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_tcr.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_tcram.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_vim.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pom.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_spi.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_stc.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_sys.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_sys2.h -include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pcr.h - -include_HEADERS += include/tm27.h - # ---------------------------- # ------ Data # ---------------------------- @@ -95,7 +25,6 @@ EXTRA_DIST += ../shared/start/start.S start.$(OBJEXT): ../shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -project_lib_DATA += startup/linkcmds EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk_with_loader @@ -109,7 +38,7 @@ EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk_intram noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) libbsp_a_LIBADD = # Shared @@ -184,10 +113,6 @@ libbsp_a_SOURCES += hwinit/tms570_selftest_par_std.c libbsp_a_SOURCES += hwinit/tms570_selftest_parity.c libbsp_a_SOURCES += hwinit/tms570_tcram_tests.c -include_bsp_HEADERS += hwinit/tms570_selftest_parity.h -include_bsp_HEADERS += hwinit/tms570_hwinit.h -include_bsp_HEADERS += hwinit/tms570_selftest.h - # Start hooks libbsp_a_SOURCES += hwinit/bspstarthooks-hwinit.c else @@ -201,5 +126,4 @@ endif DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/tms570/configure.ac b/c/src/lib/libbsp/arm/tms570/configure.ac index 37c5b61fc0..0d689efb1d 100644 --- a/c/src/lib/libbsp/arm/tms570/configure.ac +++ b/c/src/lib/libbsp/arm/tms570/configure.ac @@ -10,6 +10,8 @@ AC_INIT([rtems-c-src-lib-libbsp-arm-tms570],[_RTEMS_VERSION], [https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/tms570ls3137_hdk.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -55,7 +57,6 @@ RTEMS_BSPOPTS_HELP([TMS570_USE_HWINIT_STARTUP],[Include BSP startup code for TMS AM_CONDITIONAL(TMS570_USE_HWINIT_STARTUP,test "$TMS570_USE_HWINIT_STARTUP" = "1") RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am index 8a8a693bfd..6dbf7b0e9b 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am +++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am @@ -11,45 +11,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs ############################################################################### # Header # ############################################################################### -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h - -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h - -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-clock.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-irq.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-regs.h -include_bsp_HEADERS += ../shared/include/arm-a9mpcore-start.h -include_bsp_HEADERS += ../shared/include/arm-cp15-start.h -include_bsp_HEADERS += ../shared/include/arm-errata.h -include_bsp_HEADERS += ../shared/include/arm-gic.h -include_bsp_HEADERS += ../shared/include/arm-gic-irq.h -include_bsp_HEADERS += ../shared/include/arm-gic-regs.h -include_bsp_HEADERS += ../shared/include/arm-gic-tm27.h -include_bsp_HEADERS += ../shared/include/arm-release-id.h -include_bsp_HEADERS += include/cadence-i2c.h -include_bsp_HEADERS += include/cadence-i2c-regs.h -include_bsp_HEADERS += include/i2c.h -include_bsp_HEADERS += include/irq.h -include_bsp_HEADERS += include/zynq-uart.h -include_bsp_HEADERS += include/zynq-uart-regs.h - ############################################################################### # Data # ############################################################################### @@ -59,7 +26,6 @@ start.$(OBJEXT): ../shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -project_lib_DATA += startup/linkcmds ############################################################################### # LibBSP # @@ -68,7 +34,7 @@ project_lib_DATA += startup/linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) libbsp_a_LIBADD = # Shared @@ -131,5 +97,4 @@ libbsp_a_SOURCES += startup/bspstarthooks.c startup/bspstartmmu.c DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac index 67cdb5fd37..149ea36594 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac +++ b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac @@ -9,6 +9,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-arm-xilinx-zynq-a9],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/xilinx_zynq_a9_qemu.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am index 4207c322e0..1ebc410558 100644 --- a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am +++ b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am @@ -4,16 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_HEADERS += include/cplb.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -48,5 +40,4 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/timer.rel EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/bfin/TLL6527M/configure.ac b/c/src/lib/libbsp/bfin/TLL6527M/configure.ac index 3c3d66caea..e15493e205 100644 --- a/c/src/lib/libbsp/bfin/TLL6527M/configure.ac +++ b/c/src/lib/libbsp/bfin/TLL6527M/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-bfin-TLL6527M],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/TLL6527M.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am index 92f9795506..444c949d83 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am +++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am @@ -4,15 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -59,5 +52,4 @@ libbsp_a_LIBADD += networkconfig.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac b/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac index c1603bb23a..cc921150a0 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac +++ b/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-bfin-bf537Stamp],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/bf537Stamp.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/bfin/configure.ac b/c/src/lib/libbsp/bfin/configure.ac index 1ad9c92a97..29669cecb8 100644 --- a/c/src/lib/libbsp/bfin/configure.ac +++ b/c/src/lib/libbsp/bfin/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-bfin],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([../bfin]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am index f52d6ca76f..d88c2e0e57 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am +++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am @@ -4,16 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_HEADERS += include/cplb.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -49,5 +41,4 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/timer.rel EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/bfin/eZKit533/configure.ac b/c/src/lib/libbsp/bfin/eZKit533/configure.ac index 90c48195a2..f1c6766ace 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/configure.ac +++ b/c/src/lib/libbsp/bfin/eZKit533/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-bfin-eZKit533],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/eZKit533.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/epiphany/Makefile.am b/c/src/lib/libbsp/epiphany/Makefile.am index 86705a772c..427e0018c8 100644 --- a/c/src/lib/libbsp/epiphany/Makefile.am +++ b/c/src/lib/libbsp/epiphany/Makefile.am @@ -3,6 +3,5 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## Currently, the shared directory is not explicitly ## added but it is present in the source tree. _SUBDIRS = @RTEMS_BSP_FAMILY@ -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/epiphany/configure.ac b/c/src/lib/libbsp/epiphany/configure.ac index bba5440ca9..f351e1820f 100644 --- a/c/src/lib/libbsp/epiphany/configure.ac +++ b/c/src/lib/libbsp/epiphany/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-epiphany],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) AC_CONFIG_SRCDIR([epiphany_sim]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.12.2]) diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am index 3645c024dc..d47b1b354a 100644 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am +++ b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am @@ -9,31 +9,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp -include_libcpudir = $(includedir)/libcpu - dist_project_lib_DATA = bsp_specs ############################################################################### # Header # ############################################################################### -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -include_bsp_HEADERS = ../shared/include/linker-symbols.h - -include_bsp_HEADERS += ../../../libbsp/shared/include/mm.h -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../../shared/include/console-polled.h -include_bsp_HEADERS += include/irq.h - -nodist_include_HEADERS = include/bspopts.h - ############################################################################### # Data # ############################################################################### @@ -90,5 +71,4 @@ libbsp_a_SOURCES += console/console-io.c DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac b/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac index 05d29d7471..e0b0307971 100644 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac +++ b/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac @@ -9,6 +9,8 @@ AC_PREREQ(2.69) AC_INIT([rtems-c-src-lib-libbsp-epiphany-sim],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) AC_CONFIG_SRCDIR([make/custom/epiphany_sim.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign subdir-objects 1.12.2]) @@ -30,7 +32,6 @@ RTEMS_CHECK_SMP AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/i386/configure.ac b/c/src/lib/libbsp/i386/configure.ac index ca40d3c882..18aa96be19 100644 --- a/c/src/lib/libbsp/i386/configure.ac +++ b/c/src/lib/libbsp/i386/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-i386],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([pc386]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am index fdc192b154..b2d4511dab 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/Makefile.am @@ -12,39 +12,17 @@ CLEANFILES = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = _SUBDIRS = . tools -nodist_include_bsp_HEADERS += include/bspimpl.h -include_bsp_HEADERS = ../../i386/shared/irq/irq.h -include_bsp_HEADERS += ../../i386/shared/irq/irq_asm.h -include_bsp_HEADERS += ../../i386/shared/comm/tty_drv.h -include_bsp_HEADERS += ../../i386/shared/realmode_int/realmode_int.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += console/rtd316.h -include_bsp_HEADERS += console/exar17d15x.h -include_bsp_HEADERS += include/tblsizes.h - if HAS_SMP -include_bsp_HEADERS += ../../i386/shared/irq/apic.h -include_bsp_HEADERS += ../../i386/shared/smp/smp-imps.h endif -include_HEADERS += include/crt.h - EXTRA_DIST += start/start.S start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< @@ -76,14 +54,7 @@ libbsp_a_SOURCES += ../../shared/clockdrv_shell.h libbsp_a_SOURCES += clock/todcfg.c libbsp_a_SOURCES += ../../shared/tod.c -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = - if RTEMS_VGA -include_rtems_HEADERS += console/keyboard.h -include_rtems_HEADERS += console/kd.h -include_rtems_HEADERS += console/ps2_drv.h -include_rtems_HEADERS += console/vgacons.h libbsp_a_SOURCES += console/inch.c libbsp_a_SOURCES += console/outch.c libbsp_a_SOURCES += console/defkeymap.c @@ -95,7 +66,6 @@ libbsp_a_SOURCES += console/vt.c libbsp_a_SOURCES += console/videoAsm.S libbsp_a_SOURCES += console/kbd_parser.c libbsp_a_SOURCES += console/vgacons.c -include_bsp_HEADERS += console/fb_default_mode.h if USE_VGA libbsp_a_SOURCES += console/fb_vga.c endif @@ -103,15 +73,11 @@ if USE_CIRRUS_GD5446 libbsp_a_SOURCES += console/fb_cirrus.c endif if USE_VBE_RM -include_bsp_HEADERS += include/vbe3.h -include_HEADERS += include/edid.h -include_bsp_HEADERS += include/fb_vesa.h libbsp_a_SOURCES += console/fb_vesa_rm.c endif endif # console (non-graphics support) -include_HEADERS += ../../i386/shared/comm/i386_io.h libbsp_a_SOURCES += console/serial_mouse_config.c libbsp_a_SOURCES += ../../i386/shared/comm/uart.c libbsp_a_SOURCES += ../../i386/shared/comm/tty_drv.c @@ -142,7 +108,6 @@ libbsp_a_SOURCES += ../../i386/shared/pci/pci_io.c libbsp_a_SOURCES += ../../shared/pci/pci_bus_count.c libbsp_a_SOURCES += ../../shared/pci/pci_find_device.c -include_HEADERS += ../../i386/shared/comm/uart.h # startup libbsp_a_SOURCES += ../../shared/bsppredriverhook.c libbsp_a_SOURCES += startup/bsp_fatal_halt.c @@ -205,8 +170,6 @@ endif if HAS_NETWORKING # This driver needs to be reworked for the BSD stack. # We only install wd80x3.h if HAS_NETWORKING was defined -include_HEADERS += include/wd80x3.h - wd8003_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ noinst_PROGRAMS += wd8003.rel wd8003_rel_SOURCES = wd8003/wd8003.c @@ -251,6 +214,5 @@ EXTRA_DIST += STATUS EXTRA_DIST += times_i486dx EXTRA_DIST += times_p5 -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/i386/pc386/configure.ac b/c/src/lib/libbsp/i386/pc386/configure.ac index 83969b4f58..c08f8f40ee 100644 --- a/c/src/lib/libbsp/i386/pc386/configure.ac +++ b/c/src/lib/libbsp/i386/pc386/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-i386-pc386],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/pc386.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/i386/pc386/tools/configure.ac b/c/src/lib/libbsp/i386/pc386/tools/configure.ac index 7824833bfc..7a7c981f60 100644 --- a/c/src/lib/libbsp/i386/pc386/tools/configure.ac +++ b/c/src/lib/libbsp/i386/pc386/tools/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-i386-pc386-tools],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([Spec.doc]) RTEMS_TOP(../../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP CFLAGS="-g -O2 -Wall" diff --git a/c/src/lib/libbsp/lm32/configure.ac b/c/src/lib/libbsp/lm32/configure.ac index 79debe1a36..ce06e84b0d 100644 --- a/c/src/lib/libbsp/lm32/configure.ac +++ b/c/src/lib/libbsp/lm32/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-lm32],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([../lm32]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am index c2bbe61944..876f97bd42 100644 --- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am +++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am @@ -4,20 +4,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/system_conf.h EXTRA_DIST += ../../lm32/shared/start/start.S start.$(OBJEXT): ../../lm32/shared/start/start.S @@ -62,5 +54,4 @@ libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/lm32/lm32_evr/configure.ac b/c/src/lib/libbsp/lm32/lm32_evr/configure.ac index 9a23e7cacc..c555b77f8d 100644 --- a/c/src/lib/libbsp/lm32/lm32_evr/configure.ac +++ b/c/src/lib/libbsp/lm32/lm32_evr/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-lm32-lm32_evr],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/lm32_evr.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/lm32/milkymist/Makefile.am b/c/src/lib/libbsp/lm32/milkymist/Makefile.am index c120caa3b2..5d69c92853 100644 --- a/c/src/lib/libbsp/lm32/milkymist/Makefile.am +++ b/c/src/lib/libbsp/lm32/milkymist/Makefile.am @@ -4,36 +4,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -include_bsp_HEADERS = ../../lm32/shared/include/irq.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../lm32/shared/milkymist_gpio/milkymist_gpio.h -include_bsp_HEADERS += ../../lm32/shared/milkymist_buttons/milkymist_buttons.h -include_bsp_HEADERS += ../../lm32/shared/milkymist_ac97/milkymist_ac97.h -include_bsp_HEADERS += ../../lm32/shared/milkymist_usbinput/milkymist_usbinput.h -include_bsp_HEADERS += ../../lm32/shared/milkymist_pfpu/milkymist_pfpu.h -include_bsp_HEADERS += ../../lm32/shared/milkymist_tmu/milkymist_tmu.h -include_bsp_HEADERS += ../../lm32/shared/milkymist_memcard/milkymist_memcard.h -include_bsp_HEADERS += ../../lm32/shared/milkymist_flash/milkymist_flash.h -include_bsp_HEADERS += ../../lm32/shared/milkymist_dmx/milkymist_dmx.h -include_bsp_HEADERS += ../../lm32/shared/milkymist_midi/milkymist_midi.h -include_bsp_HEADERS += ../../lm32/shared/milkymist_ir/milkymist_ir.h -include_bsp_HEADERS += ../../lm32/shared/milkymist_video/milkymist_video.h -include_bsp_HEADERS += ../../lm32/shared/milkymist_versions/milkymist_versions.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/system_conf.h EXTRA_DIST += ../../lm32/shared/start/start.S start.$(OBJEXT): ../../lm32/shared/start/start.S @@ -124,5 +100,4 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/lm32/milkymist/configure.ac b/c/src/lib/libbsp/lm32/milkymist/configure.ac index eb41c95255..86e22b8ee6 100644 --- a/c/src/lib/libbsp/lm32/milkymist/configure.ac +++ b/c/src/lib/libbsp/lm32/milkymist/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-lm32-milkymist],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/milkymist.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m32c/configure.ac b/c/src/lib/libbsp/m32c/configure.ac index ee3f84078e..0ae91b3584 100644 --- a/c/src/lib/libbsp/m32c/configure.ac +++ b/c/src/lib/libbsp/m32c/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m32c],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([m32cbsp]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am index ef8056bcf0..3c9f992211 100644 --- a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am +++ b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am @@ -4,16 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -46,5 +38,4 @@ libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c libbsp_a_SOURCES += ../../shared/include/cache_.h libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m32c/m32cbsp/configure.ac b/c/src/lib/libbsp/m32c/m32cbsp/configure.ac index 83bc49e028..2238716b5e 100644 --- a/c/src/lib/libbsp/m32c/m32cbsp/configure.ac +++ b/c/src/lib/libbsp/m32c/m32cbsp/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m32c-m32csim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/m32csim.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/Makefile.am b/c/src/lib/libbsp/m68k/Makefile.am index e03929f5e7..649f528043 100644 --- a/c/src/lib/libbsp/m68k/Makefile.am +++ b/c/src/lib/libbsp/m68k/Makefile.am @@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## Descend into the @RTEMS_BSP_FAMILY@ directory _SUBDIRS = @RTEMS_BSP_FAMILY@ -include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = shared/include/linker-symbols.h - dist_project_lib_DATA = shared/startup/linkcmds.base EXTRA_DIST = @@ -14,10 +11,7 @@ EXTRA_DIST += shared/start.S EXTRA_DIST += shared/bspspuriousinit.c shared/m68000spurious.c -include_HEADERS = shared/mvme/mvme16x_hw.h - EXTRA_DIST += shared/gdbstub/m68k-stub.c shared/gdbstub/gdb_if.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am index 6e9ed76bee..0d4b827439 100644 --- a/c/src/lib/libbsp/m68k/av5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am @@ -4,15 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -59,5 +52,4 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/av5282/configure.ac b/c/src/lib/libbsp/m68k/av5282/configure.ac index 7282407061..f8e962925e 100644 --- a/c/src/lib/libbsp/m68k/av5282/configure.ac +++ b/c/src/lib/libbsp/m68k/av5282/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-av5282],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/av5282.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/configure.ac b/c/src/lib/libbsp/m68k/configure.ac index 4f26893934..8c5e064f3c 100644 --- a/c/src/lib/libbsp/m68k/configure.ac +++ b/c/src/lib/libbsp/m68k/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([shared]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am index 70278e70ff..a0c840b08f 100644 --- a/c/src/lib/libbsp/m68k/csb360/Makefile.am +++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am @@ -4,16 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h DISTCLEANFILES = include/bspopts.h @@ -51,5 +43,4 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/mcf5272/clock.rel \ ../../../libcpu/@RTEMS_CPU@/mcf5272/timer.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/csb360/configure.ac b/c/src/lib/libbsp/m68k/csb360/configure.ac index f2611c546b..cca659d511 100644 --- a/c/src/lib/libbsp/m68k/csb360/configure.ac +++ b/c/src/lib/libbsp/m68k/csb360/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-csb360],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/csb360.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index 58c75f7262..f8682b3b61 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am @@ -4,23 +4,11 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/m340uart.h -include_HEADERS += include/m340timer.h -include_HEADERS += include/m68340.h -include_HEADERS += include/m68340.inc -include_HEADERS += include/m68349.inc EXTRA_DIST += start/start.S start.$(OBJEXT): start/start.S @@ -53,5 +41,4 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/gen68340/configure.ac b/c/src/lib/libbsp/m68k/gen68340/configure.ac index 6a13816349..a1ef621bae 100644 --- a/c/src/lib/libbsp/m68k/gen68340/configure.ac +++ b/c/src/lib/libbsp/m68k/gen68340/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-gen68340],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/gen68340.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am index a134d792a8..19e1a31537 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am @@ -4,19 +4,11 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -dist_project_lib_DATA += startup/linkcmds startup/linkcmds.prom \ - startup/linkcmds.bootp EXTRA_DIST += start/start.S start.$(OBJEXT): start/start.S @@ -60,5 +52,4 @@ if HAS_FPSP libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/gen68360/configure.ac b/c/src/lib/libbsp/m68k/gen68360/configure.ac index 965e491c78..67d7534290 100644 --- a/c/src/lib/libbsp/m68k/gen68360/configure.ac +++ b/c/src/lib/libbsp/m68k/gen68360/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-gen68360],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/gen68360.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am index 6259cedae5..a64aa2101a 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am +++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am @@ -4,19 +4,6 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h - -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += include/irq.h - DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -31,11 +18,9 @@ dist_project_lib_DATA += startup/linkcmds.m5484FireEngine.flash dist_project_lib_DATA += startup/linkcmds.COBRA5475 dist_project_lib_DATA += startup/linkcmds.m5484FireEngine -project_lib_DATA += startup/linkcmds - noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) # startup libbsp_a_SOURCES += \ @@ -82,5 +67,4 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac index ce1804c3d2..763a12b7bb 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac +++ b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-genmcf548x],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/COBRA5475.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -43,7 +45,6 @@ RTEMS_BSPOPTS_HELP([HAS_LOW_LEVEL_INIT], [If defined, we will do all the low level init of the chip (like bus/memory...).]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am index 90937076c6..3d205660a8 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am @@ -4,23 +4,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h _SUBDIRS = . tools -include_HEADERS += include/i2c.h -include_HEADERS += include/i2cdrv.h -include_HEADERS += include/ds1307.h -include_HEADERS += include/nvram.h EXTRA_DIST += times @@ -29,7 +18,7 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds startup/gdbinit \ +dist_project_lib_DATA += startup/gdbinit \ startup/linkcmds.flash noinst_LIBRARIES = libbsp.a @@ -64,5 +53,4 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/mcf5206/timer.rel \ ../../../libcpu/@RTEMS_CPU@/mcf5206/mbus.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac index 5c46002976..3bd340e12c 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf5206elite],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mcf5206elite.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac b/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac index 39e9682157..c2654a5ca9 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf5206elite-tools],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([runtest]) RTEMS_TOP(../../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) AM_MAINTAINER_MODE diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am index e1e840966e..8ccbb801c3 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am @@ -4,15 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -50,5 +43,4 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/mcf5223x/cachepd.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mcf52235/configure.ac b/c/src/lib/libbsp/m68k/mcf52235/configure.ac index 3054b0d441..e815c1c2ee 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf52235/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf52235],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mcf52235.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am index e753379b41..9a38b71fdc 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am @@ -4,15 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -45,5 +38,4 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/mcf5225x/cachepd.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mcf5225x/configure.ac b/c/src/lib/libbsp/m68k/mcf5225x/configure.ac index 4a7371fd87..470c54e66c 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5225x/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-dpu],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mcf5225x.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am index 95de41ccb1..30d5bf61d5 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am @@ -4,15 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -60,5 +53,4 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mcf5235/configure.ac b/c/src/lib/libbsp/m68k/mcf5235/configure.ac index 82df518466..5f5100d380 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5235/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf5235],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mcf5235.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am index 49595e90f6..1885fe3a2b 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am @@ -4,15 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -22,7 +15,6 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds startup/linkcmdsflash noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -61,5 +53,4 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mcf5329/configure.ac b/c/src/lib/libbsp/m68k/mcf5329/configure.ac index ca49b5e7c7..f4d41ae35a 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5329/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf52235],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mcf5329.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am index 0d06beaeaf..cc9c717112 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am @@ -4,19 +4,10 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h -include_HEADERS += include/mrm332.h - EXTRA_DIST += times EXTRA_DIST += start/start.S @@ -51,5 +42,4 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mrm332/configure.ac b/c/src/lib/libbsp/m68k/mrm332/configure.ac index a00483fcd0..79c50cf67f 100644 --- a/c/src/lib/libbsp/m68k/mrm332/configure.ac +++ b/c/src/lib/libbsp/m68k/mrm332/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mrm332],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mrm332.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am index 2314474475..7588cb3154 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am @@ -4,22 +4,13 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = ## Zilog component header files -include_rtems_zilogdir = $(includedir)/rtems/zilog -include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8530.h EXTRA_DIST += ../../m68k/shared/start/start.S start.$(OBJEXT): ../../m68k/shared/start/start.S @@ -52,5 +43,4 @@ libbsp_a_LIBADD = \ EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme147/configure.ac b/c/src/lib/libbsp/m68k/mvme147/configure.ac index e6b583d0f3..31f7c2247b 100644 --- a/c/src/lib/libbsp/m68k/mvme147/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme147/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme147],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mvme147.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am index 1e663ceeeb..b92779c154 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am @@ -4,22 +4,13 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = ## Zilog component header files -include_rtems_zilogdir = $(includedir)/rtems/zilog -include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8530.h EXTRA_DIST += ../../m68k/shared/start/start.S start.$(OBJEXT): ../../m68k/shared/start/start.S @@ -60,5 +51,4 @@ libbsp_a_LIBADD = \ EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme147s/configure.ac b/c/src/lib/libbsp/m68k/mvme147s/configure.ac index 86dc3b4867..9b1f8dcb85 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme147s/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme147s],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mvme147s.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am index 2ea3f528fe..1a19665a6d 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am @@ -4,23 +4,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/page_table.h - ## Zilog component header files -include_rtems_zilogdir = $(includedir)/rtems/zilog -include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8036.h EXTRA_DIST += ../../m68k/shared/start/start.S start.$(OBJEXT): ../../m68k/shared/start/start.S @@ -71,5 +60,4 @@ endif EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme162/configure.ac b/c/src/lib/libbsp/m68k/mvme162/configure.ac index f3ade4ee33..fd067c0bb7 100644 --- a/c/src/lib/libbsp/m68k/mvme162/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme162/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme162],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mvme162.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am index a295731802..362bbaa9c2 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am @@ -4,19 +4,11 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/page_table.h EXTRA_DIST += ../../m68k/shared/start/start.S start.$(OBJEXT): ../../m68k/shared/start/start.S @@ -63,5 +55,4 @@ endif EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme167/configure.ac b/c/src/lib/libbsp/m68k/mvme167/configure.ac index d93f1b4ae5..6d84f472ed 100644 --- a/c/src/lib/libbsp/m68k/mvme167/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme167/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme167],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mvme167.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am index 86b75950dd..5984117378 100644 --- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am @@ -4,15 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -57,5 +50,4 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/uC5282/configure.ac b/c/src/lib/libbsp/m68k/uC5282/configure.ac index a01db32e8f..0d4e5c6fc7 100644 --- a/c/src/lib/libbsp/m68k/uC5282/configure.ac +++ b/c/src/lib/libbsp/m68k/uC5282/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-uC5282],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/uC5282.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/mips/configure.ac b/c/src/lib/libbsp/mips/configure.ac index 81973700ae..288be9e96e 100644 --- a/c/src/lib/libbsp/mips/configure.ac +++ b/c/src/lib/libbsp/mips/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-mips],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([csb350]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am index 33ec193629..5549885c7d 100644 --- a/c/src/lib/libbsp/mips/csb350/Makefile.am +++ b/c/src/lib/libbsp/mips/csb350/Makefile.am @@ -4,21 +4,9 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_bsp_HEADERS = ../shared/liblnk/regs.h #isr -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += include/irq.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -76,5 +64,4 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/csb350/configure.ac b/c/src/lib/libbsp/mips/csb350/configure.ac index ba49c66884..ef29144ea8 100644 --- a/c/src/lib/libbsp/mips/csb350/configure.ac +++ b/c/src/lib/libbsp/mips/csb350/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-mips-csb350],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/csb350.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am index c675d9f038..857450b7fa 100644 --- a/c/src/lib/libbsp/mips/hurricane/Makefile.am +++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am @@ -4,21 +4,9 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_HEADERS += include/usc.h -include_bsp_HEADERS = ../shared/liblnk/regs.h #isr -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += include/irq.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h @@ -71,5 +59,4 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/rm52xx/timer.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/hurricane/configure.ac b/c/src/lib/libbsp/mips/hurricane/configure.ac index e66e8d2794..50fb02ead8 100644 --- a/c/src/lib/libbsp/mips/hurricane/configure.ac +++ b/c/src/lib/libbsp/mips/hurricane/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-mips-hurricane],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/hurricane.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am index 6e5154d5b8..585081cbb6 100644 --- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am +++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am @@ -4,21 +4,9 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_bsp_HEADERS = ../shared/liblnk/regs.h #isr -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += include/irq.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h DISTCLEANFILES = include/bspopts.h @@ -62,5 +50,4 @@ libbsp_a_SOURCES += ../shared/irq/interruptmask.c libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/jmr3904/configure.ac b/c/src/lib/libbsp/mips/jmr3904/configure.ac index edd2420d4a..85469c8c1d 100644 --- a/c/src/lib/libbsp/mips/jmr3904/configure.ac +++ b/c/src/lib/libbsp/mips/jmr3904/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-mips-jmr3904],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/jmr3904.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/mips/malta/Makefile.am b/c/src/lib/libbsp/mips/malta/Makefile.am index b73ce85d1c..f453cad2de 100644 --- a/c/src/lib/libbsp/mips/malta/Makefile.am +++ b/c/src/lib/libbsp/mips/malta/Makefile.am @@ -7,23 +7,11 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_bsp_HEADERS = ../shared/liblnk/regs.h #isr -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += include/irq.h #pci -include_bsp_HEADERS += include/pci.h #irq -include_bsp_HEADERS += ../shared/irq/i8259.h -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h @@ -85,5 +73,4 @@ libbsp_a_SOURCES += irq/vectorisrs.c libbsp_a_SOURCES += irq/interruptmask.c libbsp_a_SOURCES += ../shared/irq/i8259.c -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/malta/configure.ac b/c/src/lib/libbsp/mips/malta/configure.ac index 248734f85b..68fc5fdda2 100644 --- a/c/src/lib/libbsp/mips/malta/configure.ac +++ b/c/src/lib/libbsp/mips/malta/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-mips-malta],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/malta.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am index b4ba01be96..4100f444ce 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am @@ -4,20 +4,9 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_bsp_HEADERS = ../shared/liblnk/regs.h #isr -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += include/irq.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -70,5 +59,4 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tx49/timer.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/rbtx4925/configure.ac b/c/src/lib/libbsp/mips/rbtx4925/configure.ac index fe8eaacd43..0eecb41500 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/configure.ac +++ b/c/src/lib/libbsp/mips/rbtx4925/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-mips-rbtx4925],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/rbtx4925.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am index b4ba01be96..4100f444ce 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am @@ -4,20 +4,9 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_bsp_HEADERS = ../shared/liblnk/regs.h #isr -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += include/irq.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -70,5 +59,4 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tx49/timer.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/rbtx4938/configure.ac b/c/src/lib/libbsp/mips/rbtx4938/configure.ac index 9d3ce56fa5..e22a435b00 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/configure.ac +++ b/c/src/lib/libbsp/mips/rbtx4938/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-mips-rbtx4938],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/rbtx4938.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/moxie/configure.ac b/c/src/lib/libbsp/moxie/configure.ac index 7aca32868e..ac8468f765 100644 --- a/c/src/lib/libbsp/moxie/configure.ac +++ b/c/src/lib/libbsp/moxie/configure.ac @@ -6,6 +6,8 @@ AC_PREREQ(2.60) AC_INIT([rtems-c-src-lib-libbsp-moxie],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([moxiesim]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.10]) diff --git a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am index a98628599d..9c99151bb9 100644 --- a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am +++ b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am @@ -8,16 +8,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h DISTCLEANFILES = include/bspopts.h @@ -54,5 +46,4 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/moxie/moxiesim/configure.ac b/c/src/lib/libbsp/moxie/moxiesim/configure.ac index aeb95b0ce7..9ac47bcb45 100644 --- a/c/src/lib/libbsp/moxie/moxiesim/configure.ac +++ b/c/src/lib/libbsp/moxie/moxiesim/configure.ac @@ -6,6 +6,8 @@ AC_PREREQ(2.60) AC_INIT([rtems-c-src-lib-libbsp-moxie-moxiesim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/moxiesim.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.10]) diff --git a/c/src/lib/libbsp/nios2/configure.ac b/c/src/lib/libbsp/nios2/configure.ac index b6f084b05b..ae0c31cd44 100644 --- a/c/src/lib/libbsp/nios2/configure.ac +++ b/c/src/lib/libbsp/nios2/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-nios2],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([nios2_iss]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am index dcaa894afe..a0b5715c0a 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am @@ -6,14 +6,6 @@ include $(top_srcdir)/../../bsp.am dist_project_lib_DATA = bsp_specs -include_bspdir = $(includedir)/bsp - -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h DISTCLEANFILES = include/bspopts.h @@ -30,7 +22,7 @@ dist_project_lib_DATA += startup/linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) # startup libbsp_a_SOURCES += ../../shared/bspclean.c @@ -54,5 +46,4 @@ libbsp_a_SOURCES += timer/timer.c # Cache libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/nios2/nios2_iss/configure.ac b/c/src/lib/libbsp/nios2/nios2_iss/configure.ac index 3f0a261e11..95f35ddada 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/configure.ac +++ b/c/src/lib/libbsp/nios2/nios2_iss/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-nios2-nios2_iss],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/nios2_iss.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/no_cpu/configure.ac b/c/src/lib/libbsp/no_cpu/configure.ac index b2feaa9b33..cf347b406f 100644 --- a/c/src/lib/libbsp/no_cpu/configure.ac +++ b/c/src/lib/libbsp/no_cpu/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-no_cpu],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([no_bsp]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am index c92c13f5a8..b157336a2f 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am @@ -4,15 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -42,5 +35,4 @@ libbsp_a_SOURCES += shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac b/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac index 1c8fb3c2c9..daa263868b 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac +++ b/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-no_cpu-no_bsp],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/no_bsp.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/or1k/Makefile.am b/c/src/lib/libbsp/or1k/Makefile.am index 6d6feb2699..2ac3c98e2c 100644 --- a/c/src/lib/libbsp/or1k/Makefile.am +++ b/c/src/lib/libbsp/or1k/Makefile.am @@ -5,6 +5,5 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## added but it is present in the source tree. _SUBDIRS = @RTEMS_BSP_FAMILY@ -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/or1k/configure.ac b/c/src/lib/libbsp/or1k/configure.ac index e809e40958..e3ee8ad9d3 100644 --- a/c/src/lib/libbsp/or1k/configure.ac +++ b/c/src/lib/libbsp/or1k/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-or1k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([generic_or1k]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am index 015391522a..516e5103d9 100644 --- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am +++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am @@ -10,34 +10,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp -include_libcpudir = $(includedir)/libcpu - dist_project_lib_DATA = bsp_specs ############################################################################### # Header # ############################################################################### -include_bsp_HEADERS = -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -include_bsp_HEADERS += ../shared/include/linker-symbols.h -include_bsp_HEADERS += ../../../libbsp/shared/include/mm.h -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../../shared/include/uart-output-char.h -include_bsp_HEADERS += ../shared/include/cache_.h -include_bsp_HEADERS += include/irq.h -include_bsp_HEADERS += include/uart.h -include_bsp_HEADERS += include/generic_or1k.h - -nodist_include_HEADERS = include/bspopts.h - ############################################################################### # Data # ############################################################################### @@ -57,7 +35,7 @@ project_lib_DATA += ../shared/startup/linkcmds.base noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_CPPFLAGS = +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) libbsp_a_LIBADD = # Startup @@ -104,5 +82,4 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/or1k/generic_or1k/configure.ac b/c/src/lib/libbsp/or1k/generic_or1k/configure.ac index a24e219a9e..25bcc6f359 100644 --- a/c/src/lib/libbsp/or1k/generic_or1k/configure.ac +++ b/c/src/lib/libbsp/or1k/generic_or1k/configure.ac @@ -8,6 +8,8 @@ AC_PREREQ(2.69) AC_INIT([rtems-c-src-lib-libbsp-or1k-generic],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/generic_or1k.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -24,7 +26,6 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am index d0eafbf86c..1f7902eff7 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am +++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am @@ -8,21 +8,12 @@ noinst_PROGRAMS = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs project_lib_DATA = #include -include_HEADERS = include/bsp.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -nodist_include_HEADERS += include/tm27.h DISTCLEANFILES += include/bspopts.h -include_bsp_HEADERS = - #start EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S @@ -69,15 +60,10 @@ libbsp_a_SOURCES += startup/bspstart.c \ startup/bspclean.c \ ../../shared/gnatinstallhandler.c -include_bsp_HEADERS += ../shared/motorola/vpd.h - #pclock libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c #console -include_bsp_HEADERS += ../../powerpc/shared/console/consoleIo.h -include_bsp_HEADERS += ../../powerpc/shared/console/uart.h - libbsp_a_SOURCES += \ ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/console/console.c \ @@ -85,43 +71,22 @@ libbsp_a_SOURCES += \ ../../powerpc/shared/console/uart.h #irq -include_bsp_HEADERS += irq/irq.h - libbsp_a_SOURCES += irq/irq_init.c irq/discovery_pic.c #marvell -include_bsp_HEADERS += marvell/gtreg.h marvell/gtintrreg.h \ - marvell/gti2creg.h marvell/gti2c_busdrv.h marvell/gt_timer.h \ - marvell/gtpcireg.h - libbsp_a_SOURCES += marvell/discovery.c marvell/gti2c.c marvell/gt_timer.c #flash -include_bsp_HEADERS += ../shared/flash/flashPgm.h -include_bsp_HEADERS += ../shared/flash/flashPgmPvt.h - libbsp_a_SOURCES += ../shared/flash/flash.c \ ../shared/flash/intelFlash.c \ flash/flashcfg.c #pci -include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h - libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \ pci/gt_pci_init.c pci/pci_io_remap.c pci/motload_fixup.c \ ../../powerpc/shared/pci/pcifinddevice.c #vme -include_bsp_HEADERS += vme/VMEConfig.h \ - ../../shared/vmeUniverse/vmeUniverse.h \ - ../../shared/vmeUniverse/vmeUniverseDMA.h \ - ../../shared/vmeUniverse/vme_am_defs.h \ - ../../shared/vmeUniverse/vmeTsi148.h \ - ../../shared/vmeUniverse/vmeTsi148DMA.h \ - ../../shared/vmeUniverse/bspVmeDmaList.h \ - ../../shared/vmeUniverse/VME.h \ - ../../shared/vmeUniverse/VMEDMA.h - libbsp_a_SOURCES += ../shared/vme/vmeconfig.c \ ../shared/vme/vme_universe.c \ ../../shared/vmeUniverse/vmeUniverse.c \ @@ -130,17 +95,12 @@ libbsp_a_SOURCES += ../shared/vme/vmeconfig.c \ #network if HAS_NETWORKING -include_bsp_HEADERS += network/support/early_enet_link_status.h \ - network/support/bsp_bsdnet_attach.h - noinst_PROGRAMS += network_support.rel network_support_rel_SOURCES = network/support/early_link_status.c \ network/support/bsp_attach.c network_support_rel_CPPFLAGS = $(AM_CPPFLAGS) network_support_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_bsp_HEADERS += network/if_mve/if_mve_pub.h - noinst_PROGRAMS += network_if_mve_tmp.rel network_if_mve_tmp_rel_SOURCES = network/if_mve/mv643xx_eth.c network_if_mve_tmp_rel_CPPFLAGS = $(AM_CPPFLAGS) -DDISABLE_DETACHING @@ -169,8 +129,6 @@ network_if_mve.rel: network_if_mve_tmp.rel -G mveth_serial_ctrl_config_val \ $^ $@ -include_bsp_HEADERS += network/if_gfe/if_gfe_pub.h - noinst_PROGRAMS += network_if_gfe_tmp.rel network_if_gfe_tmp_rel_SOURCES = network/if_gfe/if_gfe.c network/if_gfe/if_gfe_rtems.c network_if_gfe_tmp_rel_CPPFLAGS = $(AM_CPPFLAGS) \ @@ -186,8 +144,6 @@ network_if_gfe.rel: network_if_gfe_tmp.rel $^ $@ -include_bsp_HEADERS += network/if_em/if_em_pub.h - noinst_PROGRAMS += network_if_em_tmp.rel network_if_em_tmp_rel_SOURCES = network/if_em/if_em.c \ network/if_em/if_em_hw.c \ @@ -224,5 +180,4 @@ endif EXTRA_DIST += README LICENSE -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/beatnik/configure.ac b/c/src/lib/libbsp/powerpc/beatnik/configure.ac index 82c73b03ec..d8a6fa1371 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/configure.ac +++ b/c/src/lib/libbsp/powerpc/beatnik/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-beatnik],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/beatnik.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/powerpc/configure.ac b/c/src/lib/libbsp/powerpc/configure.ac index bf3947cd11..2725b86d1c 100644 --- a/c/src/lib/libbsp/powerpc/configure.ac +++ b/c/src/lib/libbsp/powerpc/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([qoriq]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am index 3110518f21..488cb83804 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am @@ -4,19 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp -include_bestcommdir = $(include_bspdir)/bestcomm -include_bestcomm_includedir = $(include_bestcommdir)/include -include_bestcomm_include_mgt5200dir = $(include_bestcomm_includedir)/mgt5200 -include_bestcomm_task_apidir = $(include_bestcommdir)/task_api - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h include/i2cdrv.h \ - include/i2c.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -33,7 +22,6 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S project_lib_DATA += rtems_crti.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds.gen5200_base -project_lib_DATA += startup/linkcmds EXTRA_DIST += startup/linkcmds.brs5l EXTRA_DIST += startup/linkcmds.brs6l EXTRA_DIST += startup/linkcmds.icecube @@ -62,19 +50,6 @@ libbsp_a_SOURCES += bestcomm/include/ppctypes.h \ bestcomm/task_api/bestcomm_api_mem.h bestcomm/task_api/bestcomm_cntrl.h \ bestcomm/task_api/tasksetup_bdtable.h \ bestcomm/task_api/tasksetup_general.h -include_bestcomm_HEADERS = bestcomm/bestcomm_priv.h \ - bestcomm/dma_image.h \ - bestcomm/dma_image.capi.h \ - bestcomm/bestcomm_api.h \ - bestcomm/bestcomm_glue.h -include_bestcomm_include_HEADERS = bestcomm/include/ppctypes.h -include_bestcomm_include_mgt5200_HEADERS = bestcomm/include/mgt5200/mgt5200.h \ - bestcomm/include/mgt5200/sdma.h -include_bestcomm_task_api_HEADERS = bestcomm/task_api/tasksetup_general.h \ - bestcomm/task_api/tasksetup_bdtable.h \ - bestcomm/task_api/bestcomm_cntrl.h \ - bestcomm/task_api/bestcomm_api_mem.h - # clock # clock libbsp_a_SOURCES += ../shared/clock/clock.c @@ -88,24 +63,6 @@ libbsp_a_SOURCES += ide/ata.c libbsp_a_SOURCES += ide/ata-instance.c libbsp_a_SOURCES += ide/ata-dma-pio-single.c -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/bootcard.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/u-boot.h -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../shared/include/u-boot-board-info.h -include_bsp_HEADERS += include/ata.h -include_bsp_HEADERS += include/bestcomm.h -include_bsp_HEADERS += include/bestcomm_ops.h -include_bsp_HEADERS += include/i2cdrv.h -include_bsp_HEADERS += include/i2c.h -include_bsp_HEADERS += include/irq.h -include_bsp_HEADERS += include/mpc5200.h -include_bsp_HEADERS += include/mscan-base.h -include_bsp_HEADERS += include/u-boot-config.h -include_bsp_HEADERS += mscan/mscan.h - # irq libbsp_a_SOURCES += include/irq.h \ irq/irq.c \ @@ -118,11 +75,9 @@ libbsp_a_SOURCES += include/irq.h \ # mscan libbsp_a_SOURCES += mscan/mscan.c mscan/mscan-base.c mscan/mscan.h mscan/mscan_int.h -include_bsp_HEADERS += nvram/nvram.h # nvram libbsp_a_SOURCES += nvram/nvram.c nvram/nvram.h nvram/m93cxx.h -include_bsp_HEADERS += slicetimer/slicetimer.h # slicetimer libbsp_a_SOURCES += slicetimer/slicetimer.c slicetimer/slicetimer.h @@ -162,5 +117,4 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/gen5200/configure.ac b/c/src/lib/libbsp/powerpc/gen5200/configure.ac index 74b7440f44..bf9c992bdb 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/configure.ac +++ b/c/src/lib/libbsp/powerpc/gen5200/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-gen5200],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/brs5l.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -129,7 +131,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AC_CONFIG_FILES([Makefile]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS RTEMS_PPC_EXCEPTIONS diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am index d6aaf3c6c4..7df2b0f184 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am @@ -4,31 +4,10 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/u-boot.h -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../shared/include/linker-symbols.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += ../shared/include/tictac.h -include_bsp_HEADERS += ../shared/include/u-boot-board-info.h -include_bsp_HEADERS += include/hwreg_vals.h -include_bsp_HEADERS += include/irq.h -include_bsp_HEADERS += include/tsec-config.h -include_bsp_HEADERS += include/u-boot-config.h - noinst_PROGRAMS = @@ -42,8 +21,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA += rtems_crti.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds \ - ../shared/startup/linkcmds.base \ +dist_project_lib_DATA += ../shared/startup/linkcmds.base \ startup/linkcmds.mpc83xx \ startup/linkcmds.mpc8309som \ startup/linkcmds.mpc8313erdb \ @@ -119,5 +97,4 @@ endif EXTRA_DIST += README.mpc8349eamds -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/gen83xx/configure.ac b/c/src/lib/libbsp/powerpc/gen83xx/configure.ac index 7764d2ef9e..f555c106be 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/configure.ac +++ b/c/src/lib/libbsp/powerpc/gen83xx/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-gen83xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/br_uid.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -92,7 +94,6 @@ AC_CONFIG_FILES([Makefile]) RTEMS_BSP_BOOTCARD_OPTIONS RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS RTEMS_PPC_EXCEPTIONS diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am index 1a835adaed..0467da14f0 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am +++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am @@ -4,16 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/mmu_405.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h @@ -39,14 +31,10 @@ libbsp_a_SOURCES += ../../shared/bspclean.c \ # dlentry libbsp_a_SOURCES += dlentry/dlentry.S -include_bsp_HEADERS = ../../powerpc/shared/console/uart.h \ - ../../powerpc/shared/console/consoleIo.h # console libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/console/console.c -include_bsp_HEADERS += irq/irq.h - # irq libbsp_a_SOURCES += irq/irq_init.c irq/irq.c @@ -70,5 +58,4 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/haleakala/configure.ac b/c/src/lib/libbsp/powerpc/haleakala/configure.ac index 63111bc435..92c16db812 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/configure.ac +++ b/c/src/lib/libbsp/powerpc/haleakala/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-haleakala],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/haleakala.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index dd7f91c6ed..81fd05cc0a 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -10,20 +10,12 @@ endif include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += ../../powerpc/shared/include/nvram.h EXTRA_DIST += ../../powerpc/shared/start/start.S start.$(OBJEXT): ../../powerpc/shared/start/start.S @@ -67,9 +59,6 @@ libbsp_a_SOURCES += ../../shared/tod.c ../../powerpc/shared/tod/todcfg.c # pclock libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c -include_bsp_HEADERS = ../../powerpc/shared/console/consoleIo.h -include_bsp_HEADERS += ../../powerpc/shared/console/uart.h - # Needs conditional compilation polledIO_CPPFLAGS = -DSTATIC_LOG_ALLOC noinst_PROGRAMS += polledIO.rel @@ -84,25 +73,20 @@ libbsp_a_SOURCES += ../../powerpc/shared/console/consoleIo.h libbsp_a_SOURCES += ../../powerpc/shared/console/keyboard.h libbsp_a_SOURCES += ../../powerpc/shared/console/uart.h -include_bsp_HEADERS += include/bsp/irq.h - # irq libbsp_a_SOURCES += ../../powerpc/shared/irq/irq_init.c libbsp_a_SOURCES += ../../powerpc/shared/irq/openpic_i8259_irq.c libbsp_a_SOURCES += ../../powerpc/shared/irq/i8259.c -include_bsp_HEADERS += ../../powerpc/shared/motorola/motorola.h # motorola libbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.h libbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.c -include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h # openpic libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.c libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h -include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h # pci libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c libbsp_a_SOURCES += ../../powerpc/shared/pci/detect_raven_bridge.c @@ -110,20 +94,11 @@ libbsp_a_SOURCES += ../../powerpc/shared/pci/generic_clear_hberrs.c libbsp_a_SOURCES += ../../powerpc/shared/pci/pcifinddevice.c libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.h -include_bsp_HEADERS += ../../powerpc/shared/residual/residual.h \ - ../../powerpc/shared/residual/pnp.h # residual libbsp_a_SOURCES += ../../powerpc/shared/residual/pnp.h libbsp_a_SOURCES += ../../powerpc/shared/residual/residual.h libbsp_a_SOURCES += ../../powerpc/shared/residual/residual.c -include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ - ../../shared/vmeUniverse/vme_am_defs.h \ - ../../shared/vmeUniverse/VME.h \ - ../../powerpc/shared/vme/VMEConfig.h \ - ../../shared/vmeUniverse/vmeUniverseDMA.h\ - ../../shared/vmeUniverse/bspVmeDmaList.h\ - ../../shared/vmeUniverse/VMEDMA.h # vme libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.c libbsp_a_SOURCES += ../../shared/vmeUniverse/bspVmeDmaList.c @@ -136,7 +111,6 @@ libbsp_a_SOURCES += ../../powerpc/shared/vme/VMEConfig.h if QEMU if HAS_NETWORKING -nodist_include_HEADERS += $(srcdir)/../../i386/pc386/include/wd80x3.h ne2000_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ ne2000_CPPFLAGS += '-Dbsp_cmdline_arg=rtems_bsp_cmdline_get_param_raw' noinst_PROGRAMS += ne2000.rel @@ -171,6 +145,5 @@ EXTRA_DIST += BOOTING README.mtx603e README.MVME2100 README.MVME2300 \ EXTRA_DIST += README.dec21140 EXTRA_DIST += times.mcp750 times.mvme2307 -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am index dd832f07f4..6b76ed8f70 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am @@ -23,11 +23,11 @@ bootloader_SOURCES = ../../../powerpc/shared/bootloader/head.S \ # ---- # Remove references to EABI when compiling bootloader BOOTLOADER_CPU_CFLAGS=$(subst -msdata=eabi,,$(subst -meabi,,$(CPU_CFLAGS))) -AM_CPPFLAGS = -D__BOOT__ +AM_CPPFLAGS = -D__BOOT__ @RTEMS_CPPFLAGS@ @RTEMS_BSP_CPPFLAGS@ AM_CFLAGS = $(GCCSPECS) -mrelocatable -msoft-float \ -mstrict-align -fno-builtin -Wall -mmultiple -mstring -O2 \ -fomit-frame-pointer -ffixed-r13 -mno-sdata $(BOOTLOADER_CPU_CFLAGS) -AM_CCASFLAGS = $(AM_CPPFLAGS) $(GCCSPECS) \ +AM_CCASFLAGS = $(AM_CPPFLAGS) \ -mrelocatable -DASM $(BOOTLOADER_CPU_CFLAGS) # diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac index 2670d0df57..6a0c4ca66d 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-motorola_powerpc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mcp750.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am index fa8eb58fe8..bf0cdd6efb 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am @@ -4,11 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -45,26 +42,6 @@ dist_project_lib_DATA += startup/linkcmds.mpc5674f_rsm6_base noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -# Includes -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../shared/include/linker-symbols.h -include_bsp_HEADERS += ../shared/include/start.h -include_bsp_HEADERS += ../shared/include/tictac.h -include_bsp_HEADERS += include/bsp/irq.h -include_bsp_HEADERS += include/mpc55xx-config.h -include_bsp_HEADERS += include/smsc9218i.h -include_bsp_HEADERS += include/console-esci.h -include_bsp_HEADERS += include/console-generic.h -include_bsp_HEADERS += include/console-linflex.h - # startup libbsp_a_SOURCES += ../../shared/bootcard.c libbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c @@ -141,5 +118,4 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac index caa630e609..a893a287ab 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac @@ -11,6 +11,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-mpc55xxevb],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/gwlcfm.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -220,7 +222,6 @@ RTEMS_BSPOPTS_HELP([MPC55XX_ENABLE_START_PROLOGUE],[if defined, enable start pro AC_CONFIG_FILES([Makefile]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS RTEMS_PPC_EXCEPTIONS diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index 5436770e52..604e3cc613 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am @@ -4,15 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -39,10 +32,6 @@ libbsp_a_SOURCES += ../shared/clock/clock.c # console libbsp_a_SOURCES += console/console.c -include_bsp_HEADERS = irq/irq.h \ - ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h - # irq libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c libbsp_a_SOURCES += ../../shared/src/irq-generic.c @@ -84,5 +73,4 @@ endif EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac index b1f1c27631..939026ea3e 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-mpc8260ads],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mpc8260ads.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am index 83b63c2374..3d215114ac 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am @@ -4,15 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -64,39 +57,27 @@ libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c # pclock libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c -include_bsp_HEADERS = ../../powerpc/shared/console/uart.h # console libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/console/console.c \ ../../powerpc/shared/console/consoleIo.h \ ../../powerpc/shared/console/uart.h -include_bsp_HEADERS += irq/irq.h # irq libbsp_a_SOURCES += irq/irq_init.c \ ../../powerpc/shared/irq/openpic_i8259_irq.c -include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h # openpic libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h \ ../../powerpc/shared/openpic/openpic.c \ ../../powerpc/shared/openpic/openpic.h -include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h # pci libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \ pci/detect_host_bridge.c \ ../../powerpc/shared/pci/generic_clear_hberrs.c \ ../../powerpc/shared/pci/pcifinddevice.c ../../powerpc/shared/pci/pci.h -include_bsp_HEADERS += vme/VMEConfig.h \ - ../../shared/vmeUniverse/vmeTsi148.h \ - ../../shared/vmeUniverse/vme_am_defs.h \ - ../../shared/vmeUniverse/VME.h \ - ../../shared/vmeUniverse/vmeTsi148DMA.h\ - ../../shared/vmeUniverse/bspVmeDmaList.h\ - ../../shared/vmeUniverse/VMEDMA.h - # vme libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeTsi148.c \ ../../shared/vmeUniverse/bspVmeDmaList.c \ @@ -106,23 +87,18 @@ libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeTsi148.c \ ../../powerpc/shared/vme/vmeconfig.c \ ../../powerpc/shared/vme/vme_universe.c -include_bsp_HEADERS += ../shared/flash/flashPgm.h \ - ../shared/flash/flashPgmPvt.h # flash libbsp_a_SOURCES += ../shared/flash/flash.c \ ../shared/flash/spansionFlash.c \ flash/flashcfg.c -include_bsp_HEADERS += i2c/mpc8540_i2c_busdrv.h # i2c libbsp_a_SOURCES += i2c/mpc8540_i2c.c i2c/i2c_init.c -include_bsp_HEADERS += ../shared/motorola/vpd.h # vpd libbsp_a_SOURCES += ../shared/motorola/vpd.c if HAS_NETWORKING -include_bsp_HEADERS += network/if_tsec_pub.h noinst_PROGRAMS += network.rel network_rel_SOURCES = network/tsec.c network_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -145,5 +121,4 @@ endif EXTRA_DIST += LICENSE README KNOWN_PROBLEMS -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mvme3100/configure.ac b/c/src/lib/libbsp/powerpc/mvme3100/configure.ac index f19e6c6164..3c70b03882 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/configure.ac +++ b/c/src/lib/libbsp/powerpc/mvme3100/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-mvme3100],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mvme3100.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am index 4b1c464502..f8c0ba350d 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am @@ -4,15 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -41,54 +34,35 @@ libbsp_a_SOURCES += startup/bspstart.c \ # pclock libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c -include_bsp_HEADERS = ../../powerpc/shared/console/uart.h -include_bsp_HEADERS += ../../powerpc/shared/console/consoleIo.h # console libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/console/console.c -include_bsp_HEADERS += pci/gtpcireg.h -include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h # pci libbsp_a_SOURCES += pci/pci.c libbsp_a_SOURCES += pci/pci_interface.c libbsp_a_SOURCES += pci/detect_host_bridge.c libbsp_a_SOURCES += ../../shared/pci/pci_find_device.c -include_bsp_HEADERS += irq/irq.h # irq libbsp_a_SOURCES += irq/irq_init.c irq/BSP_irq.c # tod libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c -include_bsp_HEADERS += vectors/bspException.h - # vectors libbsp_a_SOURCES += vectors/exceptionhandler.c \ ../../powerpc/shared/start/vectors_entry.S -include_bsp_HEADERS += GT64260/bspMvme5500.h GT64260/gtreg.h \ - GT64260/GT64260TWSI.h GT64260/VPD.h # GT64260 libbsp_a_SOURCES += GT64260/GT64260TWSI.c GT64260/MVME5500I2C.c -include_bsp_HEADERS += ../../shared/vmeUniverse/VME.h vme/VMEConfig.h \ - ../../shared/vmeUniverse/vmeUniverse.h \ - ../../shared/vmeUniverse/vmeUniverseDMA.h\ - ../../shared/vmeUniverse/bspVmeDmaList.h\ - ../../shared/vmeUniverse/VMEDMA.h \ - ../../shared/vmeUniverse/vme_am_defs.h # vme libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.c\ ../shared/vme/vmeconfig.c ../../shared/vmeUniverse/bspVmeDmaList.c\ ../shared/vme/vme_universe.c if HAS_NETWORKING -include_bsp_HEADERS += network/if_100MHz/GT64260eth.h \ - network/if_100MHz/GT64260ethreg.h network/if_1GHz/if_wmreg.h \ - network/if_1GHz/pcireg.h - network_CPPFLAGS = -D_KERNEL -D__BSD_VISIBLE noinst_PROGRAMS += network.rel network_rel_SOURCES = network/if_100MHz/GT64260eth.c \ @@ -125,5 +99,4 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mvme5500/configure.ac b/c/src/lib/libbsp/powerpc/mvme5500/configure.ac index 2e93857cff..4b0974e3c9 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/configure.ac +++ b/c/src/lib/libbsp/powerpc/mvme5500/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-mvme5500],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mvme5500.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am index 66150472d6..ee196160ef 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am @@ -4,19 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_HEADERS += include/psim.h - -include_bsp_HEADERS = ../shared/include/linker-symbols.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h DISTCLEANFILES = include/bspopts.h @@ -52,8 +41,6 @@ libbsp_a_SOURCES += ../../shared/console-polled.c libbsp_a_SOURCES += console/console-io.c console/consupp.S # irq -include_bsp_HEADERS += irq/irq.h ../shared/openpic/openpic.h \ - ../../shared/include/irq-generic.h libbsp_a_SOURCES += irq/irq_init.c ../shared/irq/openpic_i8259_irq.c \ ../shared/openpic/openpic.c ../../shared/src/irq-server.c \ ../../shared/src/irq-generic.c ../../shared/src/irq-default-handler.c @@ -84,5 +71,4 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/psim/configure.ac b/c/src/lib/libbsp/powerpc/psim/configure.ac index d97ac6c8c3..d9e69d0171 100644 --- a/c/src/lib/libbsp/powerpc/psim/configure.ac +++ b/c/src/lib/libbsp/powerpc/psim/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-psim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/psim.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am index 7be4f11de3..c88bf5e62d 100644 --- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am @@ -4,16 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -46,9 +38,6 @@ clock_SOURCES = ../shared/clock/clock.c console_SOURCES = ../../shared/console-polled.c console/console-io.c # irq -include_bsp_HEADERS = irq/irq.h \ - ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h irq_SOURCES = irq_SOURCES += ../../shared/src/irq-default-handler.c irq_SOURCES += ../../shared/src/irq-generic.c @@ -70,5 +59,4 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/qemuppc/configure.ac b/c/src/lib/libbsp/powerpc/qemuppc/configure.ac index 3209a0073c..d509d8fbda 100644 --- a/c/src/lib/libbsp/powerpc/qemuppc/configure.ac +++ b/c/src/lib/libbsp/powerpc/qemuppc/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-qemuppc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/qemuppc.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am index 646dbfbc28..cf34ca193b 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am @@ -4,16 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp -include_asmdir = $(includedir)/asm -include_uapi_asmdir = $(includedir)/uapi/asm - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h DISTCLEANFILES = include/bspopts.h EXTRA_DIST += README @@ -21,27 +13,6 @@ EXTRA_DIST += README noinst_PROGRAMS = -include_bsp_HEADERS = include/irq.h \ - ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h \ - ../../shared/include/bootcard.h \ - ../../shared/include/utility.h \ - ../shared/include/start.h \ - ../shared/include/tictac.h \ - ../shared/include/linker-symbols.h \ - include/tsec-config.h \ - include/mmu.h \ - include/intercom.h \ - include/uart-bridge.h \ - include/qoriq.h - -include_asm_HEADERS = -include_asm_HEADERS += include/asm/epapr_hcalls.h -include_asm_HEADERS += include/asm/fsl_hcalls.h - -include_uapi_asm_HEADERS = -include_uapi_asm_HEADERS += include/uapi/asm/epapr_hcalls.h - EXTRA_DIST += start/start.S start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< @@ -57,8 +28,7 @@ rtems_crtn.$(OBJEXT): ../../powerpc/shared/start/rtems_crtn.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA += rtems_crtn.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds \ - ../shared/startup/linkcmds.base \ +dist_project_lib_DATA += ../shared/startup/linkcmds.base \ startup/linkcmds.qoriq_core_0 \ startup/linkcmds.qoriq_core_1 \ startup/linkcmds.qoriq_e500 \ @@ -141,5 +111,4 @@ if HAS_SMP libbsp_a_SOURCES += startup/bspsmp.c endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/qoriq/configure.ac b/c/src/lib/libbsp/powerpc/qoriq/configure.ac index f0e8af62d7..52e28d4637 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/configure.ac +++ b/c/src/lib/libbsp/powerpc/qoriq/configure.ac @@ -2,6 +2,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-qoriq],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/qoriq_core_0.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.10]) @@ -168,7 +170,6 @@ AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"]) RTEMS_BSP_CLEANUP_OPTIONS RTEMS_PPC_EXCEPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am index a2cd12f4f2..0ee770d055 100644 --- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am @@ -4,19 +4,10 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h -include_bsp_HEADERS = irq/irq.h - EXTRA_DIST += times dist_project_lib_DATA += startup/linkcmds @@ -55,5 +46,4 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/mpc5xx/timer.rel \ ../../../libcpu/@RTEMS_CPU@/mpc5xx/vectors.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/ss555/configure.ac b/c/src/lib/libbsp/powerpc/ss555/configure.ac index f586a58bc2..1002eaf71f 100644 --- a/c/src/lib/libbsp/powerpc/ss555/configure.ac +++ b/c/src/lib/libbsp/powerpc/ss555/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-mbx5xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/ss555.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am index 811e244dfb..92990ae6b2 100644 --- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am @@ -4,14 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h DISTCLEANFILES = include/bspopts.h EXTRA_DIST += README @@ -19,15 +13,6 @@ EXTRA_DIST += README noinst_PROGRAMS = -include_bsp_HEADERS = include/irq.h \ - ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h \ - ../../shared/include/bootcard.h \ - ../../shared/include/utility.h \ - ../shared/include/start.h \ - ../shared/include/tictac.h \ - ../shared/include/linker-symbols.h - EXTRA_DIST += start/start.S start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< @@ -38,8 +23,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA += rtems_crti.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds \ - ../shared/startup/linkcmds.base \ +dist_project_lib_DATA += ../shared/startup/linkcmds.base \ startup/linkcmds.t32mppc noinst_LIBRARIES = libbsp.a @@ -88,5 +72,4 @@ if HAS_SMP libbsp_a_SOURCES += ../../shared/bspsmp.c endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/t32mppc/configure.ac b/c/src/lib/libbsp/powerpc/t32mppc/configure.ac index efaf446f73..f19c60656e 100644 --- a/c/src/lib/libbsp/powerpc/t32mppc/configure.ac +++ b/c/src/lib/libbsp/powerpc/t32mppc/configure.ac @@ -2,6 +2,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-qoriq],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/t32mppc.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.10]) @@ -33,7 +35,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") RTEMS_BSP_CLEANUP_OPTIONS RTEMS_PPC_EXCEPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am index 5b21dc1b7a..bd047edb22 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am @@ -4,24 +4,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_bsp_HEADERS = include/tqm.h include/8xx_immap.h \ - include/irq.h \ - ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h \ - spi/spi.h EXTRA_DIST += start/start.S start.$(OBJEXT): start/start.S @@ -33,7 +21,6 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA += rtems_crti.$(OBJEXT) -project_lib_DATA += startup/linkcmds dist_project_lib_DATA += startup/linkcmds.tqm8xx_base EXTRA_DIST += startup/linkcmds.tqm8xx @@ -92,5 +79,4 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac b/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac index e94c509ae6..f83cb67c73 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac +++ b/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-tqm8xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/pghplus.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -95,7 +97,6 @@ RTEMS_BSPOPTS_HELP([BSP_USE_NETWORK_SCC], AC_CONFIG_FILES([Makefile]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS RTEMS_PPC_EXCEPTIONS diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am index 9b6de34f50..30c88a3cb0 100644 --- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am @@ -4,29 +4,16 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_HEADERS += include/xparameters_dflt.h if HAS_NETWORKING -include_HEADERS += network/xiltemac.h endif -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h - -include_bsp_HEADERS = - DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_bsp_HEADERS += ../shared/include/linker-symbols.h - EXTRA_DIST += start/start.S start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< @@ -38,7 +25,6 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S project_lib_DATA += rtems_crti.$(OBJEXT) # Link commands -project_lib_DATA += startup/linkcmds dist_project_lib_DATA += ../shared/startup/linkcmds.base noinst_LIBRARIES = libbsp.a @@ -60,10 +46,6 @@ libbsp_a_SOURCES += console/consolelite.c ../../shared/console.c \ ../../shared/console_read.c ../../shared/console_write.c # irq -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += include/opbintctrl.h -include_bsp_HEADERS += irq/irq.h libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c libbsp_a_SOURCES += ../../shared/src/irq-generic.c libbsp_a_SOURCES += ../../shared/src/irq-info.c @@ -98,5 +80,4 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/virtex/configure.ac b/c/src/lib/libbsp/powerpc/virtex/configure.ac index 323d9759ed..4edc6a193d 100644 --- a/c/src/lib/libbsp/powerpc/virtex/configure.ac +++ b/c/src/lib/libbsp/powerpc/virtex/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-virtex],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/virtex.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am index 28411c1fd0..4ec0f9167e 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am @@ -5,18 +5,9 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs # include -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -include_bsp_HEADERS = - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h # start @@ -49,11 +40,9 @@ libbsp_a_SOURCES += startup/dummy_console.c \ ../../shared/dummy_printk_support.c # irq -include_bsp_HEADERS += include/irq.h libbsp_a_SOURCES += irq/irq_init.c # mmu -include_bsp_HEADERS += include/mmu.h libbsp_a_SOURCES += mmu/mmu.c libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ @@ -65,5 +54,4 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/virtex4/configure.ac b/c/src/lib/libbsp/powerpc/virtex4/configure.ac index 8546bfc3a9..f38bec6a4a 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/configure.ac +++ b/c/src/lib/libbsp/powerpc/virtex4/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-virtex4],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/virtex4.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am index 5466edf088..a43caad9ae 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am @@ -4,18 +4,9 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs # include -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -include_bsp_HEADERS = - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h # start @@ -51,11 +42,9 @@ libbsp_a_SOURCES += startup/dummy_console.c \ ../../shared/dummy_printk_support.c # irq -include_bsp_HEADERS += include/irq.h libbsp_a_SOURCES += irq/irq_init.c # mmu -include_bsp_HEADERS += include/mmu.h libbsp_a_SOURCES += mmu/mmu.c libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ @@ -67,5 +56,4 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/virtex5/configure.ac b/c/src/lib/libbsp/powerpc/virtex5/configure.ac index f3a156cb44..096976897b 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/configure.ac +++ b/c/src/lib/libbsp/powerpc/virtex5/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-virtex5],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/virtex5.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/riscv/Makefile.am b/c/src/lib/libbsp/riscv/Makefile.am index 9c319b6fd4..574ae94411 100644 --- a/c/src/lib/libbsp/riscv/Makefile.am +++ b/c/src/lib/libbsp/riscv/Makefile.am @@ -6,9 +6,5 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal _SUBDIRS = @RTEMS_BSP_FAMILY@ -include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = shared/include/linker-symbols.h - -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/riscv/configure.ac b/c/src/lib/libbsp/riscv/configure.ac index 4479d9ab48..b8c432cb47 100644 --- a/c/src/lib/libbsp/riscv/configure.ac +++ b/c/src/lib/libbsp/riscv/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-riscv],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) AC_CONFIG_SRCDIR([../riscv]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.12.2]) diff --git a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am index 91f7204296..e04fd89a69 100644 --- a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am +++ b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am @@ -9,31 +9,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp -include_libcpudir = $(includedir)/libcpu - dist_project_lib_DATA = bsp_specs ############################################################################### # Header # ############################################################################### -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -include_bsp_HEADERS = ../shared/include/linker-symbols.h - -include_bsp_HEADERS += ../../../libbsp/shared/include/mm.h -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../../shared/include/console-polled.h -include_bsp_HEADERS += include/irq.h - -nodist_include_HEADERS = include/bspopts.h - ############################################################################### # Data # ############################################################################### @@ -91,5 +72,4 @@ libbsp_a_SOURCES += console/console-io.c DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/riscv/riscv_generic/configure.ac b/c/src/lib/libbsp/riscv/riscv_generic/configure.ac index e2a02a3e9f..e8c3506d8d 100644 --- a/c/src/lib/libbsp/riscv/riscv_generic/configure.ac +++ b/c/src/lib/libbsp/riscv/riscv_generic/configure.ac @@ -9,6 +9,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-riscv_generic],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) AC_CONFIG_SRCDIR([make/custom/riscv_generic.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -30,7 +32,6 @@ RTEMS_CHECK_SMP AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/sh/configure.ac b/c/src/lib/libbsp/sh/configure.ac index e54378682b..79df52f9a9 100644 --- a/c/src/lib/libbsp/sh/configure.ac +++ b/c/src/lib/libbsp/sh/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-sh],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([gensh1]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am index 50bf67569e..c212e313a6 100644 --- a/c/src/lib/libbsp/sh/gensh1/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am @@ -4,24 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_shdir = $(includedir)/sh -include_rtems_scoredir = $(includedir)/rtems/score -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_sh_HEADERS = include/sh/sci.h -include_sh_HEADERS += include/sh/sh7_pfc.h -include_sh_HEADERS += include/sh/sh7_sci.h - -include_rtems_score_HEADERS = include/rtems/score/ispsh7032.h -include_rtems_score_HEADERS += include/rtems/score/iosh7032.h - -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h @@ -69,5 +53,4 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/gensh1/configure.ac b/c/src/lib/libbsp/sh/gensh1/configure.ac index 6d49847588..bf5cd49c55 100644 --- a/c/src/lib/libbsp/sh/gensh1/configure.ac +++ b/c/src/lib/libbsp/sh/gensh1/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-sh-gensh1],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/gensh1.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index 57f0ab7b3b..513a611e0f 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am @@ -4,26 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_shdir = $(includedir)/sh -include_rtems_scoredir = $(includedir)/rtems/score -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -include_sh_HEADERS = include/sh/io_types.h -include_sh_HEADERS += include/sh/sci.h -include_sh_HEADERS += include/sh/sh7_pfc.h -include_sh_HEADERS += include/sh/sh7_sci.h -include_sh_HEADERS += include/sh/sci_termios.h - -include_rtems_score_HEADERS = include/rtems/score/ispsh7045.h -include_rtems_score_HEADERS += include/rtems/score/iosh7045.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h @@ -33,9 +15,6 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds startup/linkcmds.ram \ - startup/linkcmds.rom - noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -72,5 +51,4 @@ libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c libbsp_a_SOURCES += ../../shared/include/cache_.h libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/gensh2/configure.ac b/c/src/lib/libbsp/sh/gensh2/configure.ac index 4fdd7e5717..2d08637bac 100644 --- a/c/src/lib/libbsp/sh/gensh2/configure.ac +++ b/c/src/lib/libbsp/sh/gensh2/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-sh-gensh2],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/gensh2.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am index f31be5acb3..dc5cad1263 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am @@ -4,37 +4,15 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_shdir = $(includedir)/sh -include_rtems_scoredir = $(includedir)/rtems/score -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -include_sh_HEADERS = include/sh/sh4uart.h - -include_rtems_score_HEADERS = include/rtems/score/sh7750_regs.h -include_rtems_score_HEADERS += include/rtems/score/ipl.h -include_rtems_score_HEADERS += include/rtems/score/iosh7750.h -include_rtems_score_HEADERS += include/rtems/score/ispsh7750.h -include_rtems_score_HEADERS += include/rtems/score/sh4_regs.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h -include_HEADERS += include/sdram.h - EXTRA_DIST += start/start.S start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds startup/linkcmds.rom \ - startup/linkcmds.rom2ram - noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -62,5 +40,4 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/gensh4/configure.ac b/c/src/lib/libbsp/sh/gensh4/configure.ac index 002f8ff75c..6e866aaccb 100644 --- a/c/src/lib/libbsp/sh/gensh4/configure.ac +++ b/c/src/lib/libbsp/sh/gensh4/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-sh-gensh4],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/gensh4.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am index 98839139fe..78467c3cb8 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/Makefile.am @@ -4,17 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = include/syscall.h - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h DISTCLEANFILES = include/bspopts.h @@ -60,5 +51,4 @@ libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c libbsp_a_SOURCES += ../../shared/include/cache_.h libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/shsim/configure.ac b/c/src/lib/libbsp/sh/shsim/configure.ac index 25fa949461..07b040e7a4 100644 --- a/c/src/lib/libbsp/sh/shsim/configure.ac +++ b/c/src/lib/libbsp/sh/shsim/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-sh-shsim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/simsh1.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/sparc/configure.ac b/c/src/lib/libbsp/sparc/configure.ac index a3adc185e0..11de57ce07 100644 --- a/c/src/lib/libbsp/sparc/configure.ac +++ b/c/src/lib/libbsp/sparc/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc], [_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([shared]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am index cf019faa95..4a7bfb44f8 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am @@ -4,27 +4,18 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/erc32.h EXTRA_DIST += ../../sparc/shared/start/start.S start.$(OBJEXT): ../../sparc/shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds ../shared/startup/linkcmds.base noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -51,7 +42,6 @@ libbsp_a_SOURCES += ../../sparc/shared/cpu.c libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S # gnatsupp libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c -include_bsp_HEADERS = ../shared/include/gnatcommon.h # console libbsp_a_SOURCES += console/erc32_console.c ../../shared/console.c \ ../../shared/console_select.c ../../shared/console_control.c \ @@ -65,10 +55,6 @@ libbsp_a_SOURCES += ../../shared/clockdrv_shell.h libbsp_a_SOURCES += timer/timer.c # IRQ -include_bsp_HEADERS += \ - ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h \ - include/bsp/irq.h libbsp_a_SOURCES += \ ../../sparc/shared/irq/irq-shared.c \ ../../sparc/shared/irq/bsp_isr_handler.c \ @@ -103,5 +89,4 @@ endif EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc/erc32/configure.ac b/c/src/lib/libbsp/sparc/erc32/configure.ac index 566a959b10..67aa56d71a 100644 --- a/c/src/lib/libbsp/sparc/erc32/configure.ac +++ b/c/src/lib/libbsp/sparc/erc32/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc-erc32], [_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/erc32.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am index 3a5845c8c9..2c4b564089 100644 --- a/c/src/lib/libbsp/sparc/leon2/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am @@ -4,21 +4,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_bsp_HEADERS = ../../sparc/shared/include/debug_defs.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/leon.h EXTRA_DIST += ../../sparc/shared/start/start.S start.$(OBJEXT): ../../sparc/shared/start/start.S @@ -54,19 +45,13 @@ libbsp_a_SOURCES += ../../sparc/shared/cpu.c libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S # gnatsupp libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c -include_bsp_HEADERS += ../shared/include/gnatcommon.h # console libbsp_a_SOURCES += console/console.c console/debugputs.c # clock libbsp_a_SOURCES += clock/ckinit.c libbsp_a_SOURCES += ../../shared/clockdrv_shell.h # IRQ -include_bsp_HEADERS += ../../sparc/shared/include/genirq.h libbsp_a_SOURCES += ../../sparc/shared/irq/genirq.c -include_bsp_HEADERS += \ - ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h \ - include/bsp/irq.h libbsp_a_SOURCES += \ ../../sparc/shared/irq/irq-shared.c \ ../../sparc/shared/irq/bsp_isr_handler.c \ @@ -78,10 +63,6 @@ libbsp_a_SOURCES += \ ../../shared/src/irq-shell.c # AMBA bus -include_HEADERS += ../../sparc/shared/include/ambapp.h -include_HEADERS += ../../sparc/shared/include/ambapp_ids.h -include_HEADERS += ../../sparc/shared/include/grlib.h -include_bsp_HEADERS += ../../sparc/shared/include/ahbstat.h libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_alloc.c libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_count.c @@ -95,17 +76,10 @@ libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_show.c libbsp_a_SOURCES += ../../sparc/shared/amba/ahbstat.c # Clock Driver and Timer Library -include_bsp_HEADERS += ../../sparc/shared/include/gptimer.h -include_bsp_HEADERS += ../../sparc/shared/include/tlib.h libbsp_a_SOURCES += ../../sparc/shared/timer/gptimer.c libbsp_a_SOURCES += ../../sparc/shared/timer/tlib.c # PCI -include_bsp_HEADERS += ../../sparc/shared/include/grpci.h -include_bsp_HEADERS += ../../sparc/shared/include/grpci2.h -include_bsp_HEADERS += ../../sparc/shared/include/grpci2dma.h -include_bsp_HEADERS += ../../sparc/shared/include/pcif.h -include_bsp_HEADERS += include/at697_pci.h libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2dma.c libbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c @@ -115,13 +89,6 @@ libbsp_a_SOURCES += ../../sparc/shared/pci/pci_memreg_sparc_be.c libbsp_a_SOURCES += pci/at697_pci.c # PCI target devices -include_bsp_HEADERS += ../../sparc/shared/include/gr_701.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_adcdac.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_io.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_spw_router.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_tmtc.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_leon4_n2x.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_cpci_gr740.h libbsp_a_SOURCES += ../../sparc/shared/pci/gr_701.c libbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_adcdac.c libbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_io.c @@ -131,104 +98,66 @@ libbsp_a_SOURCES += ../../sparc/shared/pci/gr_leon4_n2x.c libbsp_a_SOURCES += ../../sparc/shared/pci/gr_cpci_gr740.c # B1553BRM -include_bsp_HEADERS += ../../sparc/shared/include/b1553brm.h -include_bsp_HEADERS += ../../sparc/shared/include/b1553rt.h libbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c libbsp_a_SOURCES += ../../sparc/shared/1553/b1553rt.c # GR1553B -include_bsp_HEADERS += ../../sparc/shared/include/gr1553b.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc_list.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553bm.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553rt.h libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553b.c libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bc.c libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bm.c libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553rt.c # CAN -include_bsp_HEADERS += ../../sparc/shared/include/occan.h -include_bsp_HEADERS += ../../sparc/shared/include/grcan.h libbsp_a_SOURCES += ../../sparc/shared/can/occan.c \ ../../sparc/shared/can/grcan.c # SpaceWire if !HAS_SMP -include_bsp_HEADERS += ../../sparc/shared/include/grspw.h libbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c endif -include_bsp_HEADERS += ../../sparc/shared/include/grspw_pkt.h -include_bsp_HEADERS += ../../sparc/shared/include/grspw_router.h libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_pkt.c libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_router.c # UART (RAW) -include_bsp_HEADERS += ../../sparc/shared/include/apbuart.h - # I2CMST -include_bsp_HEADERS += ../../sparc/shared/include/i2cmst.h libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c # SPI -include_bsp_HEADERS += ../../sparc/shared/include/spictrl.h libbsp_a_SOURCES += ../../sparc/shared/spi/spictrl.c # TIME -include_bsp_HEADERS += ../../sparc/shared/include/spwcuc.h -include_bsp_HEADERS += ../../sparc/shared/include/grctm.h libbsp_a_SOURCES += ../../sparc/shared/time/spwcuc.c libbsp_a_SOURCES += ../../sparc/shared/time/grctm.c # GPIO -include_bsp_HEADERS += ../../sparc/shared/include/grgpio.h -include_bsp_HEADERS += ../../sparc/shared/include/gpiolib.h libbsp_a_SOURCES += ../../sparc/shared/gpio/grgpio.c libbsp_a_SOURCES += ../../sparc/shared/gpio/gpiolib.c # PWM -include_bsp_HEADERS += ../../sparc/shared/include/grpwm.h libbsp_a_SOURCES += ../../sparc/shared/pwm/grpwm.c # ADC and DAC -include_bsp_HEADERS += ../../sparc/shared/include/gradcdac.h libbsp_a_SOURCES += ../../sparc/shared/analog/gradcdac.c # Memory controllers libbsp_a_SOURCES += ../../sparc/shared/mem/mctrl.c -include_bsp_HEADERS += ../../sparc/shared/include/mctrl.h - # l2cache libbsp_a_SOURCES += ../../sparc/shared/l2c/l2c.c -include_bsp_HEADERS += ../../sparc/shared/include/l2c.h - # griommu libbsp_a_SOURCES += ../../sparc/shared/iommu/griommu.c -include_bsp_HEADERS += ../../sparc/shared/include/griommu.h - # timer libbsp_a_SOURCES += timer/timer.c # TM/TC -include_bsp_HEADERS += ../../sparc/shared/include/grtc.h -include_bsp_HEADERS += ../../sparc/shared/include/grtm.h libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtc.c libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtm.c # MEMSCRUB libbsp_a_SOURCES += ../../sparc/shared/scrub/memscrub.c -include_bsp_HEADERS += ../../sparc/shared/include/memscrub.h - # L4STAT libbsp_a_SOURCES += ../../sparc/shared/stat/l4stat.c -include_bsp_HEADERS += ../../sparc/shared/include/l4stat.h - # Driver Manager -include_drvmgrdir = $(includedir)/drvmgr -include_drvmgr_HEADERS = ../../sparc/shared/include/drvmgr/ambapp_bus.h -include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/leon2_amba_bus.h -include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/bspcommon.h libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus.c libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus_leon2.c libbsp_a_SOURCES += ../../sparc/shared/drvmgr/leon2_amba_bus.c @@ -258,13 +187,11 @@ endif if HAS_NETWORKING noinst_PROGRAMS += leon_greth.rel leon_greth_rel_SOURCES = ../../sparc/shared/net/greth.c -include_bsp_HEADERS += ../../sparc/shared/include/greth.h leon_greth_rel_CPPFLAGS = $(AM_CPPFLAGS) leon_greth_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ leon_greth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # BSP Network configuration -include_bsp_HEADERS += ../../sparc/shared/include/network_interface_add.h libbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c endif @@ -282,5 +209,4 @@ endif EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc/leon2/configure.ac b/c/src/lib/libbsp/sparc/leon2/configure.ac index 5ca4a1353a..5d47b03851 100644 --- a/c/src/lib/libbsp/sparc/leon2/configure.ac +++ b/c/src/lib/libbsp/sparc/leon2/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc-leon2], [_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/leon2.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -36,7 +38,6 @@ RTEMS_BSPOPTS_HELP([BSP_POWER_DOWN_AT_FATAL_HALT], error which will hand over to debugger, simulator, etc.]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am index b73569d222..02864e18dc 100644 --- a/c/src/lib/libbsp/sparc/leon3/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am @@ -4,21 +4,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_bsp_HEADERS = ../../sparc/shared/include/debug_defs.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/leon.h EXTRA_DIST += ../../sparc/shared/start/start.S start.$(OBJEXT): ../../sparc/shared/start/start.S @@ -26,7 +17,6 @@ start.$(OBJEXT): ../../sparc/shared/start/start.S project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += ../shared/startup/linkcmds.base -dist_project_lib_DATA += startup/linkcmds dist_project_lib_DATA += startup/linkcmds.leon3 dist_project_lib_DATA += startup/linkcmds.ut699 dist_project_lib_DATA += startup/linkcmds.gr712rc @@ -55,13 +45,7 @@ libbsp_a_SOURCES += ../../sparc/shared/cpu.c libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S # gnatsupp libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c -include_bsp_HEADERS += ../shared/include/gnatcommon.h # AMBA bus -include_HEADERS += include/amba.h -include_HEADERS += ../../sparc/shared/include/ambapp.h -include_HEADERS += ../../sparc/shared/include/ambapp_ids.h -include_HEADERS += ../../sparc/shared/include/grlib.h -include_bsp_HEADERS += ../../sparc/shared/include/ahbstat.h libbsp_a_SOURCES += amba/amba.c libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_alloc.c @@ -76,8 +60,6 @@ libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_show.c libbsp_a_SOURCES += ../../sparc/shared/amba/ahbstat.c # Clock Driver and Timer Library -include_bsp_HEADERS += ../../sparc/shared/include/gptimer.h -include_bsp_HEADERS += ../../sparc/shared/include/tlib.h libbsp_a_SOURCES += ../../sparc/shared/timer/gptimer.c libbsp_a_SOURCES += ../../sparc/shared/timer/tlib.c libbsp_a_SOURCES += ../../sparc/shared/timer/tlib_ckinit.c @@ -90,17 +72,10 @@ libbsp_a_SOURCES += ../../shared/console-termios.c libbsp_a_SOURCES += console/console.c libbsp_a_SOURCES += ../../sparc/shared/uart/cons.c libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart_cons.c -include_bsp_HEADERS += ../../sparc/shared/include/cons.h -include_bsp_HEADERS += ../../sparc/shared/include/apbuart_cons.h # debugio libbsp_a_SOURCES += console/printk_support.c # IRQ -include_bsp_HEADERS += ../../sparc/shared/include/genirq.h -include_bsp_HEADERS += \ - ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h \ - include/bsp/irq.h libbsp_a_SOURCES += \ startup/eirq.c \ ../../sparc/shared/irq/genirq.c \ @@ -114,10 +89,6 @@ libbsp_a_SOURCES += \ ../../shared/src/irq-shell.c # PCI -include_bsp_HEADERS += ../../sparc/shared/include/grpci.h -include_bsp_HEADERS += ../../sparc/shared/include/grpci2.h -include_bsp_HEADERS += ../../sparc/shared/include/grpci2dma.h -include_bsp_HEADERS += ../../sparc/shared/include/pcif.h libbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2dma.c @@ -126,14 +97,6 @@ libbsp_a_SOURCES += ../../sparc/shared/pci/pci_memreg_sparc_le.c libbsp_a_SOURCES += ../../sparc/shared/pci/pci_memreg_sparc_be.c # PCI target devices -include_bsp_HEADERS += ../../sparc/shared/include/gr_701.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_adcdac.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_io.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_spw_router.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_tmtc.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_tmtc_1553.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_leon4_n2x.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_cpci_gr740.h libbsp_a_SOURCES += ../../sparc/shared/pci/gr_701.c libbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_adcdac.c libbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_io.c @@ -144,122 +107,78 @@ libbsp_a_SOURCES += ../../sparc/shared/pci/gr_leon4_n2x.c libbsp_a_SOURCES += ../../sparc/shared/pci/gr_cpci_gr740.c # B1553BRM -include_bsp_HEADERS += ../../sparc/shared/include/b1553brm.h -include_bsp_HEADERS += ../../sparc/shared/include/b1553rt.h libbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c libbsp_a_SOURCES += ../../sparc/shared/1553/b1553rt.c # GR1553B -include_bsp_HEADERS += ../../sparc/shared/include/gr1553b.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc_list.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553bm.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553rt.h libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553b.c libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bc.c libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bm.c libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553rt.c # CAN -include_bsp_HEADERS += ../../sparc/shared/include/occan.h \ - ../../sparc/shared/include/grcan.h libbsp_a_SOURCES += ../../sparc/shared/can/occan.c \ ../../sparc/shared/can/grcan.c # SpaceWire if !HAS_SMP -include_bsp_HEADERS += ../../sparc/shared/include/grspw.h libbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c endif -include_bsp_HEADERS += ../../sparc/shared/include/grspw_pkt.h -include_bsp_HEADERS += ../../sparc/shared/include/grspw_router.h libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_pkt.c libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_router.c # UART -include_bsp_HEADERS += ../../sparc/shared/include/apbuart.h \ - ../../sparc/shared/include/apbuart_termios.h libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart_termios.c # I2CMST -include_bsp_HEADERS += ../../sparc/shared/include/i2cmst.h libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c # SPI -include_bsp_HEADERS += ../../sparc/shared/include/spictrl.h libbsp_a_SOURCES += ../../sparc/shared/spi/spictrl.c # TIME -include_bsp_HEADERS += ../../sparc/shared/include/spwcuc.h -include_bsp_HEADERS += ../../sparc/shared/include/grctm.h libbsp_a_SOURCES += ../../sparc/shared/time/spwcuc.c libbsp_a_SOURCES += ../../sparc/shared/time/grctm.c # GPIO -include_bsp_HEADERS += ../../sparc/shared/include/grgpio.h -include_bsp_HEADERS += ../../sparc/shared/include/gpiolib.h libbsp_a_SOURCES += ../../sparc/shared/gpio/grgpio.c libbsp_a_SOURCES += ../../sparc/shared/gpio/gpiolib.c # PWM -include_bsp_HEADERS += ../../sparc/shared/include/grpwm.h libbsp_a_SOURCES += ../../sparc/shared/pwm/grpwm.c # ADC and DAC -include_bsp_HEADERS += ../../sparc/shared/include/gradcdac.h libbsp_a_SOURCES += ../../sparc/shared/analog/gradcdac.c # Memory controllers libbsp_a_SOURCES += ../../sparc/shared/mem/mctrl.c -include_bsp_HEADERS += ../../sparc/shared/include/mctrl.h - # l2cache libbsp_a_SOURCES += ../../sparc/shared/l2c/l2c.c -include_bsp_HEADERS += ../../sparc/shared/include/l2c.h - # griommu libbsp_a_SOURCES += ../../sparc/shared/iommu/griommu.c -include_bsp_HEADERS += ../../sparc/shared/include/griommu.h - # timer libbsp_a_SOURCES += timer/timer.c libbsp_a_SOURCES += timer/watchdog.c -include_bsp_HEADERS += include/watchdog.h - # Cache libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c libbsp_a_SOURCES += include/cache_.h libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include # GR712 -include_bsp_HEADERS += ../../sparc/shared/include/grascs.h -include_bsp_HEADERS += ../../sparc/shared/include/satcan.h -include_bsp_HEADERS += ../../sparc/shared/include/canmux.h -include_bsp_HEADERS += ../../sparc/shared/include/grslink.h libbsp_a_SOURCES += ../../sparc/shared/ascs/grascs.c libbsp_a_SOURCES += ../../sparc/shared/can/satcan.c libbsp_a_SOURCES += ../../sparc/shared/can/canmux.c libbsp_a_SOURCES += ../../sparc/shared/slink/grslink.c # TM/TC -include_bsp_HEADERS += ../../sparc/shared/include/grtc.h -include_bsp_HEADERS += ../../sparc/shared/include/grtm.h libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtc.c libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtm.c # MEMSCRUB libbsp_a_SOURCES += ../../sparc/shared/scrub/memscrub.c -include_bsp_HEADERS += ../../sparc/shared/include/memscrub.h - # L4STAT libbsp_a_SOURCES += ../../sparc/shared/stat/l4stat.c -include_bsp_HEADERS += ../../sparc/shared/include/l4stat.h - # Driver Manager -include_drvmgrdir = $(includedir)/drvmgr -include_drvmgr_HEADERS = ../../sparc/shared/include/drvmgr/ambapp_bus_grlib.h -include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/ambapp_bus.h -include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/bspcommon.h libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus.c libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus_grlib.c libbsp_a_SOURCES += ../../sparc/shared/drvmgr/get_resarray_count.c @@ -290,7 +209,6 @@ if !HAS_SMP libbsp_a_SOURCES += leon_greth/leon_greth.c endif leon_greth_rel_SOURCES = ../../sparc/shared/net/greth.c -include_bsp_HEADERS += ../../sparc/shared/include/greth.h leon_greth_rel_CPPFLAGS = $(AM_CPPFLAGS) leon_greth_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ leon_greth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) @@ -298,7 +216,6 @@ endif # BSP Network configuration if HAS_NETWORKING -include_bsp_HEADERS += ../../sparc/shared/include/network_interface_add.h libbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c endif @@ -322,5 +239,4 @@ endif EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc/leon3/configure.ac b/c/src/lib/libbsp/sparc/leon3/configure.ac index 83e754688c..e5348c6de3 100644 --- a/c/src/lib/libbsp/sparc/leon3/configure.ac +++ b/c/src/lib/libbsp/sparc/leon3/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc-leon3], [_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/leon3.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -38,7 +40,6 @@ RTEMS_BSPOPTS_HELP([BSP_POWER_DOWN_AT_FATAL_HALT], error which will hand over to debugger, simulator, etc.]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/sparc64/configure.ac b/c/src/lib/libbsp/sparc64/configure.ac index dc62789228..4c696899f3 100644 --- a/c/src/lib/libbsp/sparc64/configure.ac +++ b/c/src/lib/libbsp/sparc64/configure.ac @@ -7,6 +7,8 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc64],[_RTEMS_VERSION],[https://devel.rtems.o # AC_CONFIG_SRCDIR([shared]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am index 0267cc9a6c..6379ccaf5e 100644 --- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am +++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am @@ -4,28 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_HEADERS += ../shared/include/asm.h - -include_bootdir = $(includedir)/boot -include_boot_HEADERS = ../shared/helenos/boot/include/align.h \ - ../shared/helenos/boot/include/balloc.h \ - ../shared/helenos/boot/include/gentypes.h \ - ../shared/helenos/boot/include/main.h \ - ../shared/helenos/boot/include/ofwarch.h \ - ../shared/helenos/boot/include/ofw.h \ - ../shared/helenos/boot/include/ofw_tree.h \ - ../shared/helenos/boot/include/register.h \ - ../shared/helenos/boot/include/stack.h \ - ../shared/helenos/boot/include/types.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -75,5 +55,4 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/sparc64-syscall.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc64/niagara/configure.ac b/c/src/lib/libbsp/sparc64/niagara/configure.ac index 761700175e..cd5d26121e 100644 --- a/c/src/lib/libbsp/sparc64/niagara/configure.ac +++ b/c/src/lib/libbsp/sparc64/niagara/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-sparc64-sun4v],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/niagara.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am index 90be322b0d..62373596ed 100644 --- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am +++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am @@ -4,74 +4,16 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_HEADERS += ../shared/include/asm.h -include_HEADERS += ../shared/include/traptable.h - ## these are the include files used by the boot process from HelenOS Sparc64 -include_bootdir = $(includedir)/boot -include_boot_HEADERS = \ - ../shared/helenos/boot/include/align.h \ - ../shared/helenos/boot/include/balloc.h \ - ../shared/helenos/boot/include/gentypes.h \ - ../shared/helenos/boot/include/main.h \ - ../shared/helenos/boot/include/ofwarch.h \ - ../shared/helenos/boot/include/ofw.h \ - ../shared/helenos/boot/include/ofw_tree.h \ - ../shared/helenos/boot/include/register.h \ - ../shared/helenos/boot/include/stack.h \ - ../shared/helenos/boot/include/types.h - ## These include files mimic the HelenOS kernel include layout, which ## in HelenOS-0.4.2 is more complicated than the boot include dirs. # assumed by the HelenOS sources to be in the root includedir. We place them # in a kernel include directory. -include_kerneldir = $(includedir)/kernel -include_kernel_HEADERS = \ - ../shared/helenos/kernel/generic/include/align.h - -include_archdir = $(includedir)/arch -include_arch_HEADERS = \ - ../shared/helenos/kernel/sparc64/include/arch.h \ - ../shared/helenos/kernel/sparc64/include/boot.h \ - ../shared/helenos/kernel/sparc64/include/regdef.h \ - ../shared/helenos/kernel/sparc64/include/stack.h - -include_arch_sun4udir = $(includedir)/arch/sun4u -include_arch_sun4u_HEADERS = \ - ../shared/helenos/kernel/sparc64/include/sun4u/arch.h - -include_arch_mmdir = $(includedir)/arch/mm -include_arch_mm_HEADERS = \ - ../shared/helenos/kernel/sparc64/include/mm/cache_spec.h \ - ../shared/helenos/kernel/sparc64/include/mm/frame.h \ - ../shared/helenos/kernel/sparc64/include/mm/mmu.h \ - ../shared/helenos/kernel/sparc64/include/mm/page.h \ - ../shared/helenos/kernel/sparc64/include/mm/tlb.h \ - ../shared/helenos/kernel/sparc64/include/mm/tte.h - - -include_arch_mm_sun4udir = $(includedir)/arch/mm/sun4u -include_arch_mm_sun4u_HEADERS = \ - ../shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h \ - ../shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h \ - ../shared/helenos/kernel/sparc64/include/mm/sun4u/page.h \ - ../shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h \ - ../shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h - -include_genarch_ofwdir = $(includedir)/genarch/ofw -include_genarch_ofw_HEADERS = \ - ../shared/helenos/kernel/genarch/include/ofw/ofw_tree.h - - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h + + DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -127,5 +69,4 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/sparc64-syscall.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc64/usiii/configure.ac b/c/src/lib/libbsp/sparc64/usiii/configure.ac index 1d183d2a63..a95c48fd8b 100644 --- a/c/src/lib/libbsp/sparc64/usiii/configure.ac +++ b/c/src/lib/libbsp/sparc64/usiii/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-sparc64-sun4u],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/usiii.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/v850/Makefile.am b/c/src/lib/libbsp/v850/Makefile.am index 15054fee72..169d11d284 100644 --- a/c/src/lib/libbsp/v850/Makefile.am +++ b/c/src/lib/libbsp/v850/Makefile.am @@ -10,6 +10,5 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@ EXTRA_DIST = -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/v850/configure.ac b/c/src/lib/libbsp/v850/configure.ac index 0c9d1eaa9c..01b8360510 100644 --- a/c/src/lib/libbsp/v850/configure.ac +++ b/c/src/lib/libbsp/v850/configure.ac @@ -5,6 +5,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-v850],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([gdbv850sim]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am index ebddaf8af3..c09c9fa252 100644 --- a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am +++ b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am @@ -7,17 +7,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - dist_project_lib_DATA = bsp_specs -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_bsp_HEADERS = include/syscall.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -53,5 +44,4 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include noinst_LIBRARIES = libbsp.a -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/v850/gdbv850sim/configure.ac b/c/src/lib/libbsp/v850/gdbv850sim/configure.ac index 26d8fa4384..7e0a060853 100644 --- a/c/src/lib/libbsp/v850/gdbv850sim/configure.ac +++ b/c/src/lib/libbsp/v850/gdbv850sim/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-v850-gdbv850sim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/v850e1sim.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libcpu/Makefile.am b/c/src/lib/libcpu/Makefile.am index 38de255d1a..9cc2ece050 100644 --- a/c/src/lib/libcpu/Makefile.am +++ b/c/src/lib/libcpu/Makefile.am @@ -1,5 +1,3 @@ -include_libcpudir = $(includedir)/libcpu - EXTRA_DIST = EXTRA_DIST += shared/include/cache.h EXTRA_DIST += shared/src/cache_manager.c diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am index 7f76673cfd..35b08e2495 100644 --- a/c/src/lib/libcpu/arm/Makefile.am +++ b/c/src/lib/libcpu/arm/Makefile.am @@ -6,17 +6,9 @@ EXTRA_DIST = noinst_PROGRAMS = -include_bspdir = $(includedir)/bsp -include_libcpudir = $(includedir)/libcpu - -include_bsp_HEADERS = -include_libcpu_HEADERS = - ## shared/include if shared -include_libcpu_HEADERS += shared/include/mmu.h - ## shared/arm920 noinst_PROGRAMS += shared/arm920.rel shared_arm920_rel_SOURCES = shared/arm920/mmu.c @@ -24,5 +16,4 @@ shared_arm920_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/src shared_arm920_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/arm/configure.ac b/c/src/lib/libcpu/arm/configure.ac index c72c34eb19..a5e3e1cc88 100644 --- a/c/src/lib/libcpu/arm/configure.ac +++ b/c/src/lib/libcpu/arm/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-arm],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([shared]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/bfin/Makefile.am b/c/src/lib/libcpu/bfin/Makefile.am index 1dc90d481b..5f981657f7 100644 --- a/c/src/lib/libcpu/bfin/Makefile.am +++ b/c/src/lib/libcpu/bfin/Makefile.am @@ -6,21 +6,12 @@ EXTRA_DIST = noinst_PROGRAMS = -include_bspdir = $(includedir)/bsp -include_libcpudir = $(includedir)/libcpu - -include_bsp_HEADERS = -include_libcpu_HEADERS = - ############ # Start of bf52x files if bf52x -include_HEADERS = bf52x/include/bf52x.h - ## INTERRUPT -include_bsp_HEADERS += bf52x/interrupt/interrupt.h noinst_PROGRAMS += bf52x/interrupt.rel bf52x_interrupt_rel_SOURCES = bf52x/interrupt/interrupt.c \ bf52x/interrupt/interrupt.h @@ -31,33 +22,12 @@ endif # endof bf52x ############ -include_libcpu_HEADERS += include/bf533.h -include_libcpu_HEADERS += include/bf537.h -include_libcpu_HEADERS += include/cecRegs.h -include_libcpu_HEADERS += include/memoryRegs.h -include_libcpu_HEADERS += include/mmuRegs.h -include_libcpu_HEADERS += include/sicRegs.h -include_libcpu_HEADERS += include/ebiuRegs.h -include_libcpu_HEADERS += include/ppiRegs.h -include_libcpu_HEADERS += include/coreTimerRegs.h -include_libcpu_HEADERS += include/wdogRegs.h -include_libcpu_HEADERS += include/timerRegs.h -include_libcpu_HEADERS += include/dmaRegs.h -include_libcpu_HEADERS += include/ethernetRegs.h -include_libcpu_HEADERS += include/uartRegs.h -include_libcpu_HEADERS += include/sportRegs.h -include_libcpu_HEADERS += include/twiRegs.h -include_libcpu_HEADERS += include/spiRegs.h -include_libcpu_HEADERS += include/rtcRegs.h -include_libcpu_HEADERS += include/gpioRegs.h - noinst_PROGRAMS += cache.rel cache_rel_SOURCES = cache/cache.c \ ../shared/src/cache_manager.c cache/cache_.h cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/cache cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += mmu/mmu.h noinst_PROGRAMS += mmu.rel mmu_rel_SOURCES = mmu/mmu.c mmu_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -66,7 +36,6 @@ mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if bf52x else -include_libcpu_HEADERS += interrupt/interrupt.h noinst_PROGRAMS += interrupt.rel interrupt_rel_SOURCES = interrupt/interrupt.c interrupt_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -84,25 +53,21 @@ rtc_rel_SOURCES = clock/rtc.c clock/rtc.h rtc_rel_CPPFLAGS = $(AM_CPPFLAGS) rtc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += serial/uart.h noinst_PROGRAMS += uart.rel uart_rel_SOURCES = serial/uart.c uart_rel_CPPFLAGS = $(AM_CPPFLAGS) uart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += serial/sport.h noinst_PROGRAMS += sport.rel sport_rel_SOURCES = serial/sport.c sport_rel_CPPFLAGS = $(AM_CPPFLAGS) sport_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += serial/spi.h noinst_PROGRAMS += spi.rel spi_rel_SOURCES = serial/spi.c spi_rel_CPPFLAGS = $(AM_CPPFLAGS) spi_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += serial/twi.h noinst_PROGRAMS += twi.rel twi_rel_SOURCES = serial/twi.c twi_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -115,7 +80,6 @@ timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if HAS_NETWORKING ## network -include_libcpu_HEADERS += network/ethernet.h network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ noinst_PROGRAMS += network.rel network_rel_SOURCES = network/ethernet.c @@ -123,5 +87,4 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/bfin/configure.ac b/c/src/lib/libcpu/bfin/configure.ac index 7888b083ea..4330957698 100644 --- a/c/src/lib/libcpu/bfin/configure.ac +++ b/c/src/lib/libcpu/bfin/configure.ac @@ -3,6 +3,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-bfin],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am index c47b9dfc39..6f1e9fe3ec 100644 --- a/c/src/lib/libcpu/i386/Makefile.am +++ b/c/src/lib/libcpu/i386/Makefile.am @@ -4,11 +4,6 @@ noinst_PROGRAMS = include $(top_srcdir)/../../../automake/compile.am -include_libcpudir = $(includedir)/libcpu - -include_libcpu_HEADERS = page.h cpuModel.h -include_libcpu_HEADERS += byteorder.h - noinst_PROGRAMS += cache.rel cache_rel_SOURCES = cache.c cache_.h \ ../shared/src/cache_manager.c ../shared/include/cache.h @@ -25,5 +20,4 @@ page_rel_SOURCES = page.c page.h page_rel_CPPFLAGS = $(AM_CPPFLAGS) page_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/i386/configure.ac b/c/src/lib/libcpu/i386/configure.ac index e03af4824a..3f0f59543a 100644 --- a/c/src/lib/libcpu/i386/configure.ac +++ b/c/src/lib/libcpu/i386/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-i386],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([idtr.S]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/lm32/Makefile.am b/c/src/lib/libcpu/lm32/Makefile.am index 5de23de6cb..1e609cabf6 100644 --- a/c/src/lib/libcpu/lm32/Makefile.am +++ b/c/src/lib/libcpu/lm32/Makefile.am @@ -21,6 +21,5 @@ shared_misc_rel_CPPFLAGS = $(AM_CPPFLAGS) $(LM32_CPPFLAGS) shared_misc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/lm32/configure.ac b/c/src/lib/libcpu/lm32/configure.ac index 53a2e4bcf4..295ae91ee2 100644 --- a/c/src/lib/libcpu/lm32/configure.ac +++ b/c/src/lib/libcpu/lm32/configure.ac @@ -3,6 +3,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-lm32],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/m68k/Makefile.am b/c/src/lib/libcpu/m68k/Makefile.am index 18724352d6..2800e421c4 100644 --- a/c/src/lib/libcpu/m68k/Makefile.am +++ b/c/src/lib/libcpu/m68k/Makefile.am @@ -67,10 +67,6 @@ EXTRA_DIST = m68040/fpsp/README if mcf5206 # mcf5206/include -include_mcf5206dir = $(includedir)/mcf5206 -include_mcf5206_HEADERS = mcf5206/include/mcf5206e.h mcf5206/include/mcfmbus.h \ - mcf5206/include/mcfuart.h - ## mcf5206/clock noinst_PROGRAMS += mcf5206/clock.rel mcf5206_clock_rel_SOURCES = mcf5206/clock/ckinit.c @@ -98,9 +94,6 @@ endif if mcf5223x ## mcf5223x/include -include_mcf5223xdir = $(includedir)/mcf5223x -include_mcf5223x_HEADERS = mcf5223x/include/mcf5223x.h - ## mcf5223x/cache noinst_PROGRAMS += mcf5223x/cachepd.rel mcf5223x_cachepd_rel_SOURCES = mcf5223x/cache/cachepd.c @@ -110,9 +103,6 @@ endif if mcf5225x ## mcf5225x/include -include_mcf5225xdir = $(includedir)/mcf5225x -include_mcf5225x_HEADERS = mcf5225x/include/mcf5225x.h - # mcf5225x/cache noinst_PROGRAMS += mcf5225x/cachepd.rel mcf5225x_cachepd_rel_SOURCES = mcf5225x/cache/cachepd.c @@ -121,15 +111,11 @@ mcf5225x_cachepd_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # Network if HAS_NETWORKING -include_mcf5225x_HEADERS += mcf5225x/include/fec.h endif ## HAS_NETWORKING endif if mcf5235 ## mcf5235/include -include_mcf5235dir = $(includedir)/mcf5235 -include_mcf5235_HEADERS = mcf5235/include/mcf5235.h - ## mcf5235/cache noinst_PROGRAMS += mcf5235/cachepd.rel mcf5235_cachepd_rel_SOURCES = mcf5235/cache/cachepd.c @@ -139,9 +125,6 @@ endif if mcf532x ## mcf532x/include -include_mcf532xdir = $(includedir)/mcf532x -include_mcf532x_HEADERS = mcf532x/include/mcf532x.h - ## mcf532x/cache noinst_PROGRAMS += mcf532x/cachepd.rel mcf532x_cachepd_rel_SOURCES = mcf532x/cache/cachepd.c @@ -151,9 +134,6 @@ endif if mcf5272 ## mcf5272/include -include_mcf5272dir = $(includedir)/mcf5272 -include_mcf5272_HEADERS = mcf5272/include/mcf5272.h - ## clock noinst_PROGRAMS += mcf5272/clock.rel mcf5272_clock_rel_SOURCES = mcf5272/clock/ckinit.c @@ -169,9 +149,6 @@ endif if mcf5282 ## mcf5282/include -include_mcf5282dir = $(includedir)/mcf5282 -include_mcf5282_HEADERS = mcf5282/include/mcf5282.h - noinst_PROGRAMS += mcf5282/cachepd.rel mcf5282_cachepd_rel_SOURCES = mcf5282/cache/cachepd.c mcf5282_cachepd_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/cache @@ -180,13 +157,8 @@ endif if mcf548x ## mcf548x/include -include_mcf548xdir = $(includedir)/mcf548x -include_mcf548x_HEADERS = mcf548x/include/mcf548x.h - ## mcf548x/mcdma noinst_PROGRAMS += mcf548x/mcdma.rel -include_mcf548x_HEADERS += mcf548x/mcdma/MCD_progCheck.h mcf548x/mcdma/MCD_dma.h \ - mcf548x/mcdma/MCD_tasksInit.h mcf548x/mcdma/mcdma_glue.h mcf548x_mcdma_rel_SOURCES = mcf548x/mcdma/MCD_dmaApi.c mcf548x/mcdma/MCD_tasksInit.c \ mcf548x/mcdma/MCD_tasks.c mcf548x/mcdma/mcdma_glue.c @@ -194,5 +166,4 @@ mcf548x_mcdma_rel_CPPFLAGS = $(AM_CPPFLAGS) mcf548x_mcdma_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/m68k/configure.ac b/c/src/lib/libcpu/m68k/configure.ac index 99596c1a3e..5f24e9efd4 100644 --- a/c/src/lib/libcpu/m68k/configure.ac +++ b/c/src/lib/libcpu/m68k/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-m68k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([m68040]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/mips/Makefile.am b/c/src/lib/libcpu/mips/Makefile.am index 2630fc29d7..84dc521fac 100644 --- a/c/src/lib/libcpu/mips/Makefile.am +++ b/c/src/lib/libcpu/mips/Makefile.am @@ -7,10 +7,6 @@ EXTRA_DIST = noinst_PROGRAMS = ## cache -include_libcpudir = $(includedir)/libcpu - -include_libcpu_HEADERS = - noinst_PROGRAMS += shared/cache.rel shared_cache_rel_SOURCES = shared/cache/cache.c \ ../shared/src/cache_manager.c shared/cache/cache_.h @@ -36,15 +32,10 @@ shared_interrupts_rel_SOURCES = shared/interrupts/installisrentries.c \ shared/interrupts/isr_entries.S shared/interrupts/isr_entries.h shared_interrupts_rel_CPPFLAGS = $(AM_CPPFLAGS) $(interrupts_CPPFLAGS) shared_interrupts_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += shared/interrupts/isr_entries.h - if tx39 -include_libcpu_HEADERS += tx39/include/tx3904.h endif if tx49 -include_libcpu_HEADERS += tx49/include/tx4925.h tx49/include/tx4938.h - noinst_PROGRAMS += tx49/timer.rel tx49_timer_rel_SOURCES = timer/timer.c timer/gettime.S tx49_timer_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -52,18 +43,13 @@ tx49_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif if au1x00 -include_libcpu_HEADERS += au1x00/include/au1x00.h - endif if rm52xx -include_libcpu_HEADERS += rm52xx/include/rm5231.h - noinst_PROGRAMS += rm52xx/timer.rel rm52xx_timer_rel_SOURCES = timer/timer.c timer/gettime.S rm52xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS) rm52xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/mips/configure.ac b/c/src/lib/libcpu/mips/configure.ac index 324dd312f7..6a9e2665d9 100644 --- a/c/src/lib/libcpu/mips/configure.ac +++ b/c/src/lib/libcpu/mips/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-mips],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([timer]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/nios2/Makefile.am b/c/src/lib/libcpu/nios2/Makefile.am index fee88258c7..7641afb335 100644 --- a/c/src/lib/libcpu/nios2/Makefile.am +++ b/c/src/lib/libcpu/nios2/Makefile.am @@ -22,6 +22,5 @@ shared_misc_rel_CPPFLAGS = $(AM_CPPFLAGS) $(NIOS2_CPPFLAGS) shared_misc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/nios2/configure.ac b/c/src/lib/libcpu/nios2/configure.ac index c37ad5509e..ce7fe1b4e9 100644 --- a/c/src/lib/libcpu/nios2/configure.ac +++ b/c/src/lib/libcpu/nios2/configure.ac @@ -3,6 +3,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-nios2],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/or1k/Makefile.am b/c/src/lib/libcpu/or1k/Makefile.am index 9c9921a100..e34d580982 100644 --- a/c/src/lib/libcpu/or1k/Makefile.am +++ b/c/src/lib/libcpu/or1k/Makefile.am @@ -12,6 +12,5 @@ shared_cache_rel_SOURCES = shared/cache/cache.c ../shared/src/cache_manager.c shared_cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/cache shared_cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/or1k/configure.ac b/c/src/lib/libcpu/or1k/configure.ac index a089a82838..80c67b63c3 100644 --- a/c/src/lib/libcpu/or1k/configure.ac +++ b/c/src/lib/libcpu/or1k/configure.ac @@ -3,6 +3,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-or1k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am index 3779ddc6c7..aab30f955b 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.am +++ b/c/src/lib/libcpu/powerpc/Makefile.am @@ -2,26 +2,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/compile.am -include_rtems_powerpcdir = $(includedir)/rtems/powerpc -include_rtems_powerpc_HEADERS = rtems/powerpc/cache.h \ - rtems/powerpc/debugmod.h rtems/powerpc/powerpc.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_libcpudir = $(includedir)/libcpu - -include_libcpu_HEADERS = shared/include/powerpc-utility.h - -include_bspdir = $(includedir)/bsp - -include_bsp_HEADERS = -include_bsp_HEADERS += new-exceptions/bspsupport/irq_supp.h -include_bsp_HEADERS += new-exceptions/bspsupport/vectors.h - -include_mpc83xxdir = $(includedir)/mpc83xx - -include_mpc83xx_HEADERS = -include_mpc83xx_HEADERS += mpc83xx/i2c/mpc83xx_i2cdrv.h - EXTRA_DIST = noinst_PROGRAMS = new-exceptions/rtems-cpu.rel @@ -66,17 +46,11 @@ EXTRA_DIST += new-exceptions/bspsupport/ppc_exc_test.c # shared/include if shared -include_libcpu_HEADERS += shared/include/io.h shared/include/mmu.h \ - shared/include/page.h \ - shared/include/byteorder.h shared/include/pgtable.h - noinst_PROGRAMS += shared/cpuIdent.rel shared_cpuIdent_rel_SOURCES = shared/include/cpuIdent.c shared/include/cpuIdent.h shared_cpuIdent_rel_CPPFLAGS = $(AM_CPPFLAGS) shared_cpuIdent_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += shared/include/cpuIdent.h - # shared/cache noinst_PROGRAMS += shared/cache.rel shared_cache_rel_SOURCES = shared/src/cache_.h \ @@ -91,8 +65,6 @@ shared_stack_rel_SOURCES = shared/src/stack.c shared/include/spr.h shared/src/st shared_stack_rel_CPPFLAGS = $(AM_CPPFLAGS) shared_stack_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += shared/include/spr.h -include_libcpu_HEADERS += shared/src/stackTrace.h endif EXTRA_DIST += ppc403/README ppc403/vectors/README @@ -113,7 +85,6 @@ endif ppc403_console_rel_CPPFLAGS = $(AM_CPPFLAGS) ppc403_console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_HEADERS = shared_cpuIdent_rel_SOURCES = shared/include/cpuIdent.c shared_cpuIdent_rel_CPPFLAGS = $(AM_CPPFLAGS) shared_cpuIdent_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) @@ -126,8 +97,6 @@ ppc403_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # ppc403/tty_drv if ppc405 -include_HEADERS += ppc403/tty_drv/tty_drv.h - noinst_PROGRAMS += ppc403/tty_drv.rel ppc403_tty_drv_rel_SOURCES = ppc403/tty_drv/tty_drv.c ppc403/tty_drv/tty_drv.h ppc403_tty_drv_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -139,20 +108,12 @@ endif # ppc4xx if ppc405 ## ppc4xx/include -include_ppc4xxdir = $(includedir)/ppc4xx -include_ppc4xx_HEADERS = ppc403/include/ppc405gp.h \ - ppc403/include/ppc405ex.h - endif # ppc405 ## mpc5xx EXTRA_DIST += mpc5xx/README if mpc5xx -include_mpc5xxdir = $(includedir)/mpc5xx - -include_HEADERS = mpc5xx/include/mpc5xx.h - # mpc5xx/clock noinst_PROGRAMS += mpc5xx/clock.rel mpc5xx_clock_rel_SOURCES = mpc5xx/clock/clock.c @@ -160,24 +121,18 @@ mpc5xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS) mpc5xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # mpc5xx/console-generic -include_mpc5xx_HEADERS = mpc5xx/include/console.h - noinst_PROGRAMS += mpc5xx/console-generic.rel mpc5xx_console_generic_rel_SOURCES = mpc5xx/console-generic/console-generic.c mpc5xx_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS) mpc5xx_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # mpc5xx/exceptions -include_libcpu_HEADERS += mpc5xx/exceptions/raw_exception.h - noinst_PROGRAMS += mpc5xx/exceptions.rel mpc5xx_exceptions_rel_SOURCES = mpc5xx/exceptions/raw_exception.c mpc5xx_exceptions_rel_CPPFLAGS = $(AM_CPPFLAGS) mpc5xx_exceptions_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # mpc5xx/irq -include_libcpu_HEADERS += mpc5xx/irq/irq.h - noinst_PROGRAMS += mpc5xx/irq.rel mpc5xx_irq_rel_SOURCES = mpc5xx/irq/irq.c mpc5xx/irq/irq_init.c mpc5xx/irq/irq_asm.S mpc5xx_irq_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -190,8 +145,6 @@ mpc5xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS) mpc5xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # mpc5xx/vectors -include_libcpu_HEADERS += mpc5xx/vectors/vectors.h - noinst_PROGRAMS += mpc5xx/vectors.rel mpc5xx_vectors_rel_SOURCES = mpc5xx/vectors/vectors_init.c mpc5xx/vectors/vectors.S \ new-exceptions/bspsupport/ppc_exc_print.c @@ -201,8 +154,6 @@ endif if mpc505 # mpc505/ictrl -include_HEADERS = mpc505/ictrl/ictrl.h - noinst_PROGRAMS += mpc505/ictrl.rel mpc505_ictrl_rel_SOURCES = mpc505/ictrl/ictrl.c mpc505_ictrl_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -224,8 +175,6 @@ endif if mpc6xx # mpc6xx/mmu -include_libcpu_HEADERS += mpc6xx/mmu/bat.h mpc6xx/mmu/pte121.h - noinst_PROGRAMS += mpc6xx/mmu.rel mpc6xx_mmu_rel_SOURCES = mpc6xx/mmu/bat.c mpc6xx/mmu/bat.h \ mpc6xx/mmu/pte121.c mpc6xx/mmu/pte121.h \ @@ -234,8 +183,6 @@ mpc6xx_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS) mpc6xx_mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # mpc6xx/clock -include_libcpu_HEADERS += mpc6xx/clock/c_clock.h - noinst_PROGRAMS += mpc6xx/clock.rel mpc6xx_clock_rel_SOURCES = mpc6xx/clock/c_clock.c mpc6xx/clock/c_clock.h mpc6xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -257,8 +204,6 @@ EXTRA_DIST += mpc6xx/altivec/README # e500/clock if e500_clock -include_libcpu_HEADERS += mpc6xx/clock/c_clock.h - noinst_PROGRAMS += e500/clock.rel e500_clock_rel_SOURCES = mpc6xx/clock/c_clock.c mpc6xx/clock/c_clock.h e500_clock_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -275,7 +220,6 @@ endif # e500/mmu if e500_mmu -include_libcpu_HEADERS += e500/mmu/e500_mmu.h noinst_PROGRAMS += e500/mmu.rel e500_mmu_rel_SOURCES = e500/mmu/mmu.c e500/mmu/e500_mmu.h e500_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -284,10 +228,6 @@ endif EXTRA_DIST += mpc8xx/README if mpc8xx -include_mpc8xxdir = $(includedir)/mpc8xx - -include_HEADERS = mpc8xx/include/mpc8xx.h - # mpc8xx/clock noinst_PROGRAMS += mpc8xx/clock.rel mpc8xx_clock_rel_SOURCES = mpc8xx/clock/clock.c @@ -295,24 +235,18 @@ mpc8xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS) mpc8xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # mpc8xx/console-generic -include_mpc8xx_HEADERS = mpc8xx/include/console.h - noinst_PROGRAMS += mpc8xx/console-generic.rel mpc8xx_console_generic_rel_SOURCES = mpc8xx/console-generic/console-generic.c mpc8xx_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS) mpc8xx_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # mpc8xx/cpm -include_mpc8xx_HEADERS += mpc8xx/include/cpm.h - noinst_PROGRAMS += mpc8xx/cpm.rel mpc8xx_cpm_rel_SOURCES = mpc8xx/cpm/cp.c mpc8xx/cpm/dpram.c mpc8xx_cpm_rel_CPPFLAGS = $(AM_CPPFLAGS) mpc8xx_cpm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # mpc8xx/mmu -include_mpc8xx_HEADERS += mpc8xx/include/mmu.h - noinst_PROGRAMS += mpc8xx/mmu.rel mpc8xx_mmu_rel_SOURCES = mpc8xx/mmu/mmu.c mpc8xx_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -327,13 +261,7 @@ endif EXTRA_DIST += mpc8260/README if mpc8260 -include_mpc8260dir = $(includedir)/mpc8260 - -include_HEADERS = mpc8260/include/mpc8260.h - # mpc8260/console-generic -include_mpc8260_HEADERS = mpc8260/include/console.h - noinst_PROGRAMS += mpc8260/console-generic.rel mpc8260_console_generic_rel_SOURCES = mpc8260/console-generic/console-generic.c \ mpc8260/include/console.h @@ -341,8 +269,6 @@ mpc8260_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS) mpc8260_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # mpc8260/cpm -include_mpc8260_HEADERS += mpc8260/include/cpm.h - noinst_PROGRAMS += mpc8260/cpm.rel mpc8260_cpm_rel_SOURCES = mpc8260/cpm/cp.c mpc8260/cpm/dpram.c mpc8260/cpm/brg.c \ mpc8260/include/cpm.h @@ -350,8 +276,6 @@ mpc8260_cpm_rel_CPPFLAGS = $(AM_CPPFLAGS) mpc8260_cpm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # mpc8260/mmu -include_mpc8260_HEADERS += mpc8260/include/mmu.h - noinst_PROGRAMS += mpc8260/mmu.rel mpc8260_mmu_rel_SOURCES = mpc8260/mmu/mmu.c \ mpc8260/include/mmu.h @@ -372,10 +296,7 @@ if mpc83xx # Includes -include_mpc83xx_HEADERS += mpc83xx/include/mpc83xx.h - # Network -include_bsp_HEADERS += mpc83xx/network/tsec.h if HAS_NETWORKING noinst_PROGRAMS += mpc83xx/tsec.rel mpc83xx_tsec_rel_SOURCES = mpc83xx/network/tsec.c @@ -390,14 +311,12 @@ mpc83xx_i2c_rel_SOURCES = mpc83xx/i2c/mpc83xx_i2cdrv.c \ mpc83xx_i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # SPI -include_mpc83xx_HEADERS += mpc83xx/spi/mpc83xx_spidrv.h noinst_PROGRAMS += mpc83xx/spi.rel mpc83xx_spi_rel_SOURCES = mpc83xx/spi/mpc83xx_spidrv.c \ mpc83xx/spi/mpc83xx_spidrv.h mpc83xx_spi_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # GTM -include_mpc83xx_HEADERS += mpc83xx/include/gtm.h noinst_PROGRAMS += mpc83xx/gtm.rel mpc83xx_gtm_rel_SOURCES = mpc83xx/gtm/gtm.c \ mpc83xx/include/gtm.h @@ -413,27 +332,6 @@ endif ############################################################################## if mpc55xx -# Includes -include_mpc55xxdir = $(includedir)/mpc55xx - -include_mpc55xx_HEADERS = -include_mpc55xx_HEADERS += mpc55xx/include/regs.h -include_mpc55xx_HEADERS += mpc55xx/include/reg-defs.h -include_mpc55xx_HEADERS += mpc55xx/include/dspi.h -include_mpc55xx_HEADERS += mpc55xx/include/edma.h -include_mpc55xx_HEADERS += mpc55xx/include/emios.h -include_mpc55xx_HEADERS += mpc55xx/include/mpc55xx.h -include_mpc55xx_HEADERS += mpc55xx/include/siu.h -include_mpc55xx_HEADERS += mpc55xx/include/watchdog.h -include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc551x.h -include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc555x.h -include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc556x.h -include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc564xL.h -include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc5668.h -include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc567x.h -include_mpc55xx_HEADERS += mpc55xx/include/regs-edma.h -include_mpc55xx_HEADERS += mpc55xx/include/regs-mmu.h - # IRQ noinst_PROGRAMS += mpc55xx/irq.rel mpc55xx_irq_rel_SOURCES = mpc55xx/irq/irq.c @@ -487,7 +385,6 @@ endif if qoriq # Network -include_bsp_HEADERS += mpc83xx/network/tsec.h if HAS_NETWORKING noinst_PROGRAMS += tsec.rel tsec_rel_SOURCES = mpc83xx/network/tsec.c @@ -500,5 +397,4 @@ endif # END: QorIQ # ############################################################################## -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/configure.ac b/c/src/lib/libcpu/powerpc/configure.ac index 81e6bfab2c..ba654372f1 100644 --- a/c/src/lib/libcpu/powerpc/configure.ac +++ b/c/src/lib/libcpu/powerpc/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-powerpc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([mpc6xx]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/sparc/Makefile.am b/c/src/lib/libcpu/sparc/Makefile.am index 67a35ee4b8..4d957dac04 100644 --- a/c/src/lib/libcpu/sparc/Makefile.am +++ b/c/src/lib/libcpu/sparc/Makefile.am @@ -4,10 +4,6 @@ include $(top_srcdir)/../../../automake/compile.am noinst_PROGRAMS = -include_libcpudir = $(includedir)/libcpu -include_libcpu_HEADERS = -include_libcpu_HEADERS += include/libcpu/access.h - noinst_PROGRAMS += cache.rel cache_rel_SOURCES = cache/cache_.h \ ../shared/src/cache_manager.c @@ -33,5 +29,4 @@ access_rel_SOURCES = access/access.S access/access_le.c access_rel_CPPFLAGS = $(AM_CPPFLAGS) access_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/sparc/configure.ac b/c/src/lib/libcpu/sparc/configure.ac index 40085add95..98b2ce8c4b 100644 --- a/c/src/lib/libcpu/sparc/configure.ac +++ b/c/src/lib/libcpu/sparc/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-sparc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([reg_win]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/sparc64/Makefile.am b/c/src/lib/libcpu/sparc64/Makefile.am index f7b3beb350..81d07d4617 100644 --- a/c/src/lib/libcpu/sparc64/Makefile.am +++ b/c/src/lib/libcpu/sparc64/Makefile.am @@ -56,5 +56,4 @@ endif #endif ### End of example. -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/sparc64/configure.ac b/c/src/lib/libcpu/sparc64/configure.ac index 5604c4215c..08607a53e7 100644 --- a/c/src/lib/libcpu/sparc64/configure.ac +++ b/c/src/lib/libcpu/sparc64/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-sparc64],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([shared]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am index cc7b27fec0..21892f1736 100644 --- a/c/src/libchip/Makefile.am +++ b/c/src/libchip/Makefile.am @@ -1,30 +1,20 @@ include $(top_srcdir)/automake/compile.am -include_libchipdir = $(includedir)/libchip -include_libchip_HEADERS = - EXTRA_DIST = noinst_LIBRARIES = noinst_PROGRAMS = # display -include_libchip_HEADERS += display/disp_hcms29xx.h - noinst_LIBRARIES += libdisplay.a libdisplay_a_SOURCES = display/disp_hcms29xx.c display/font_hcms29xx.c libdisplay_a_CPPFLAGS = $(AM_CPPFLAGS) # flash -include_libchip_HEADERS += flash/am29lv160.h - noinst_LIBRARIES += libflash.a libflash_a_SOURCES = flash/am29lv160.c libflash_a_CPPFLAGS = $(AM_CPPFLAGS) # ide -include_libchip_HEADERS += ide/ata.h ide/ide_ctrl_cfg.h ide/ide_ctrl.h \ - ide/ide_ctrl_io.h ide/ata_internal.h - noinst_LIBRARIES += libide.a libide_a_SOURCES = ide/ata.c ide/ata_util.c ide/ide_controller.c libide_a_CPPFLAGS = $(AM_CPPFLAGS) @@ -34,17 +24,12 @@ if HAS_NETWORKING noinst_LIBRARIES += libnetchip.a libnetchip_a_CPPFLAGS = $(AM_CPPFLAGS) libnetchip_a_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -include_libchip_HEADERS += network/cs8900.h network/i82586var.h \ - network/if_fxpvar.h network/sonic.h -include_libchip_HEADERS += network/open_eth.h network/if_dcreg.h libnetchip_a_SOURCES = network/cs8900.c network/dec21140.c network/i82586.c \ network/sonic.c network/if_fxp.c network/elnk.c network/open_eth.c \ network/if_dc.c if !HAS_SMP libnetchip_a_SOURCES += network/greth.c -include_libchip_HEADERS += network/greth.h endif -include_libchip_HEADERS += network/smc91111.h network/smc91111exp.h libnetchip_a_SOURCES += network/smc91111.c network/smc91111config.h endif @@ -53,9 +38,6 @@ EXTRA_DIST += network/README network/README.cs8900 network/README.dec21140 \ network/cs8900.c.bsp network/README.tulipclone # rtc -include_libchip_HEADERS += rtc/rtc.h rtc/icm7170.h rtc/m48t08.h \ - rtc/mc146818a.h rtc/ds1375-rtc.h - noinst_LIBRARIES += librtcio.a librtcio_a_CPPFLAGS = $(AM_CPPFLAGS) librtcio_a_SOURCES = rtc/rtcprobe.c rtc/icm7170.c rtc/icm7170_reg.c \ @@ -67,14 +49,6 @@ EXTRA_DIST += rtc/README.ds1643 rtc/README.icm7170 rtc/README.m48t08 \ rtc/README.m48t18 rtc/STATUS # i2c -include_libchip_HEADERS += i2c/i2c-ds1621.h \ - i2c/i2c-2b-eeprom.h \ - i2c/i2c-sc620.h \ - i2c/spi-memdrv.h \ - i2c/spi-flash-m25p40.h \ - i2c/spi-fram-fm25l256.h \ - i2c/spi-sd-card.h - noinst_LIBRARIES += libi2cio.a libi2cio_a_CPPFLAGS = $(AM_CPPFLAGS) @@ -92,10 +66,6 @@ libi2cio_a_SOURCES = i2c/i2c-ds1621.h \ i2c/spi-sd-card.c # serial -include_libchip_HEADERS += serial/mc68681.h serial/ns16550.h serial/z85c30.h \ - serial/serial.h serial/sersupp.h -include_libchip_HEADERS += serial/ns16550_p.h - noinst_LIBRARIES += libserialio.a libserialio_a_CPPFLAGS = $(AM_CPPFLAGS) libserialio_a_SOURCES = serial/mc68681.c serial/mc68681_baud.c \ @@ -110,8 +80,6 @@ EXTRA_DIST += serial/README.mc68681 serial/README.ns16550 \ ## shmdr if HAS_MP -include_HEADERS = shmdr/shm_driver.h shmdr/mpci.h - project_lib_PROGRAMS = shmdr.rel shmdr_rel_SOURCES = shmdr/addlq.c shmdr/cnvpkt.c shmdr/getlq.c shmdr/dump.c \ shmdr/fatal.c shmdr/getpkt.c shmdr/init.c shmdr/initlq.c shmdr/intr.c \ @@ -124,5 +92,4 @@ EXTRA_DIST += shmdr/README ## -- -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/c/src/make/configure.ac b/c/src/make/configure.ac index 10c47a06d8..11f2102ec5 100644 --- a/c/src/make/configure.ac +++ b/c/src/make/configure.ac @@ -8,6 +8,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-make],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([bsp.cfg.in]) RTEMS_TOP(../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP AC_SUBST(RTEMS_TOPdir,../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index b6760dd859..02713d7fc4 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -6,6 +6,11 @@ include $(top_srcdir)/automake/compile.am ## Setup the variant build subdirectory project_lib_DATA = o-optimize/librtemsbsp.a + +$(PROJECT_LIB)/librtemsbsp.a: o-optimize/librtemsbsp.a + $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemsbsp.a +TMPINSTALL_FILES = $(PROJECT_LIB)/librtemsbsp.a + CLEANFILES = o-optimize/librtemsbsp.a SRCS = ../support/libsupport.a @@ -62,5 +67,4 @@ o-optimize/librtemsbsp.a: $(SRCS) rm -f $@-list o-optimize/*.$(OBJEXT) o-optimize/*.rel $(RANLIB) $@ -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/configure.ac b/configure.ac index 941455f00c..2d1842e2d7 100644 --- a/configure.ac +++ b/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([c]) RTEMS_TOP([.]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP # Abort if trying to build inside of the source tree. AS_IF([test -f aclocal/version.m4],[ @@ -26,7 +28,6 @@ RTEMS_ENABLE_CXX RTEMS_ENABLE_TESTS RTEMS_ENABLE_RTEMS_DEBUG RTEMS_ENABLE_RTEMSBSP -RTEMS_ENABLE_MULTILIB RTEMS_ENABLE_PARAVIRT RTEMS_ENABLE_DRVMGR @@ -48,9 +49,6 @@ AS_IF([test $host != $build],[ RTEMS_HOST_CONFIG_SUBDIRS([tools/build]) ]) -AS_IF([test x"$enable_multilib" = x"yes"],[ - RTEMS_TARGET_CONFIG_SUBDIRS([cpukit]) -]) RTEMS_TARGET_CONFIG_SUBDIRS([c]) AC_CONFIG_FILES([Makefile]) diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index d317fbba1c..73245a7b63 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -29,292 +29,66 @@ _SUBDIRS += telnetd _SUBDIRS += pppd _SUBDIRS += mghttpd -noinst_DATA = preinstall-stamp -preinstall-stamp: - $(MAKE) $(AM_MAKEFLAGS) preinstall - touch preinstall-stamp -CLEANFILES = preinstall-stamp - -include_HEADERS = -include_HEADERS += include/endian.h -include_HEADERS += include/zconf.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = - -include_rtems_rtemsdir = $(includedir)/rtems/rtems -include_rtems_rtems_HEADERS = - -include_uuiddir = $(includedir)/uuid -include_uuid_HEADERS = libmisc/uuid/uuid.h - -include_utf8procdir = $(includedir)/utf8proc -include_utf8proc_HEADERS = libmisc/utf8proc/utf8proc.h - -include_sysdir = $(includedir)/sys -include_sys_HEADERS = - -include_HEADERS += include/crypt.h -include_HEADERS += include/memory.h - -include_HEADERS += libmisc/xz/xz.h - -include_sys_HEADERS += libcsupport/include/sys/event.h -include_sys_HEADERS += libcsupport/include/sys/poll.h -include_sys_HEADERS += libcsupport/include/sys/statvfs.h -include_sys_HEADERS += libcsupport/include/sys/utsname.h - -include_sys_HEADERS += include/sys/endian.h -include_sys_HEADERS += include/sys/priority.h - if LIBNETWORKING -include_rtems_bsdnetdir = $(includedir)/rtems/bsdnet -include_rtems_bsdnet_HEADERS = libnetworking/rtems/bsdnet/servers.h -include_rtems_bsdnet_HEADERS += libnetworking/rtems/bsdnet/_types.h endif if LIBDL -include_HEADERS += libdl/dlfcn.h -include_HEADERS += libdl/include/link.h -include_HEADERS += libdl/include/link_elf.h -include_sys_HEADERS += libdl/include/sys/cdefs_elf.h -include_sys_HEADERS += libdl/include/sys/exec_elf.h -include_arch_machinedir = $(includedir)/machine -include_arch_machine_HEADERS = -include_arch_machine_HEADERS += libdl/include/arch/@RTEMS_CPU@/machine/elf_machdep.h -include_rtems_rtldir = $(includedir)/rtems/rtl -include_rtems_rtl_HEADERS = -include_rtems_rtl_HEADERS += libdl/dlfcn-shell.h -include_rtems_rtl_HEADERS += libdl/rtl.h libdl/rtl-allocator.h libdl/rtl-obj-fwd.h -include_rtems_rtl_HEADERS += libdl/rtl-fwd.h libdl/rtl-obj.h libdl/rtl-obj-cache.h -include_rtems_rtl_HEADERS += libdl/rtl-obj-comp.h libdl/rtl-unresolved.h -include_rtems_rtl_HEADERS += libdl/rtl-indirect-ptr.h libdl/rtl-sym.h libdl/rtl-trace.h -include_rtems_rtl_HEADERS += libdl/rap.h libdl/rap-shell.h endif if LIBDEBUGGER -include_rtems_HEADERS += libdebugger/rtems-debugger.h -include_rtems_debuggerdir = $(includedir)/rtems/debugger -include_rtems_debugger_HEADERS = -include_rtems_debugger_HEADERS += libdebugger/rtems-debugger-server.h -include_rtems_debugger_HEADERS += libdebugger/rtems-debugger-remote.h endif -include_rtems_HEADERS += include/rtems/bspIo.h -include_rtems_HEADERS += include/rtems/inttypes.h -include_rtems_HEADERS += include/rtems/print.h -include_rtems_HEADERS += include/rtems/printer.h -include_rtems_HEADERS += include/rtems/userenv.h -include_rtems_HEADERS += include/rtems/fs.h if !LIBPCI -include_rtems_HEADERS += include/rtems/pci.h endif -include_rtems_HEADERS += include/rtems/concat.h -include_rtems_HEADERS += include/rtems/status-checks.h - -include_rtems_HEADERS += include/rtems/endian.h - -include_rtems_HEADERS += include/rtems/btimer.h -include_rtems_HEADERS += include/rtems/console.h -include_rtems_HEADERS += include/rtems/clockdrv.h -include_rtems_HEADERS += include/rtems/framebuffer.h -include_rtems_HEADERS += include/rtems/rtc.h -include_rtems_HEADERS += include/rtems/watchdogdrv.h - ## should be conditional and only installed for PowerPC, x86, and ARM -include_rtems_HEADERS += include/rtems/irq.h - -include_rtems_HEADERS += include/rtems/irq-extension.h - ## libfs -include_rtems_HEADERS += libfs/src/imfs/imfs.h - ## POSIX FIFO/pipe -include_rtems_HEADERS += libfs/src/pipe/pipe.h - ## devfs -include_rtems_HEADERS += libfs/src/devfs/devfs.h - if LIBDOSFS -include_rtems_HEADERS += libfs/src/dosfs/dosfs.h endif # RFS -include_rtems_HEADERS += libfs/src/rfs/rtems-rfs.h -include_rtems_HEADERS += libfs/src/rfs/rtems-rfs-format.h -include_rtems_HEADERS += libfs/src/rfs/rtems-rfs-shell.h - -include_rtems_rfsdir = $(include_rtemsdir)/rfs -include_rtems_rfs_HEADERS = -include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-bitmaps.h -include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-block-pos.h -include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-block.h -include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-buffer.h -include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-data.h -include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-dir.h -include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-dir-hash.h -include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-file.h -include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-file-system-fwd.h -include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-file-system.h -include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-group.h -include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-inode.h -include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-link.h -include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-mutex.h -include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-trace.h - # JFFS2 -include_rtems_HEADERS += libfs/src/jffs2/include/rtems/jffs2.h - ## libblock -include_rtems_HEADERS += libblock/include/rtems/bdbuf.h -include_rtems_HEADERS += libblock/include/rtems/blkdev.h -include_rtems_HEADERS += libblock/include/rtems/diskdevs.h -include_rtems_HEADERS += libblock/include/rtems/flashdisk.h -include_rtems_HEADERS += libblock/include/rtems/ramdisk.h -include_rtems_HEADERS += libblock/include/rtems/nvdisk.h -include_rtems_HEADERS += libblock/include/rtems/nvdisk-sram.h -include_rtems_HEADERS += libblock/include/rtems/sparse-disk.h -include_rtems_HEADERS += libblock/include/rtems/ide_part_table.h -include_rtems_HEADERS += libblock/include/rtems/bdpart.h -include_rtems_HEADERS += libblock/include/rtems/media.h - ## ftpd if LIBNETWORKING -include_rtems_HEADERS += ftpd/ftpd.h endif ## bspcmdline -include_rtems_HEADERS += libmisc/bspcmdline/bspcmdline.h - ## capture -include_rtems_HEADERS += libmisc/capture/capture.h -include_rtems_HEADERS += libmisc/capture/capture-cli.h -include_rtems_HEADERS += libmisc/capture/captureimpl.h - # tracing headers -include_rtems_tracedir = $(include_rtemsdir)/trace -include_rtems_trace_HEADERS = -include_rtems_trace_HEADERS += libmisc/capture/rtems-trace-buffer-vars.h - ## cpuuse -include_rtems_HEADERS += libmisc/cpuuse/cpuuse.h - ## devnull -include_rtems_HEADERS += libmisc/devnull/devnull.h -include_rtems_HEADERS += libmisc/devnull/devzero.h - ## dumpbuf -include_rtems_HEADERS += libmisc/dumpbuf/dumpbuf.h - ## rtemsfdt -include_rtems_HEADERS += libmisc/rtems-fdt/rtems-fdt.h -include_rtems_HEADERS += libmisc/rtems-fdt/rtems-fdt-shell.h - ## monitor -include_rtems_HEADERS += libmisc/monitor/monitor.h - ## fb -include_rtems_HEADERS += libmisc/fb/fb.h -include_rtems_HEADERS += libmisc/fb/mw_uid.h - ## mouse -include_rtems_HEADERS += libmisc/mouse/mouse_parser.h -include_rtems_HEADERS += libmisc/mouse/serial_mouse.h - ## libqos -include_rtems_HEADERS += libqos/qreslib.h - ## redirector -include_rtems_HEADERS += libmisc/redirector/stdio-redirect.h ## shell if LIBSHELL -include_rtems_HEADERS += libmisc/shell/shell.h -include_rtems_HEADERS += libmisc/shell/shellconfig.h endif ## stringto -include_rtems_HEADERS += libmisc/stringto/stringto.h - ## testsupport -include_rtems_HEADERS += libmisc/testsupport/test.h - ## i2c -include_rtems_HEADERS += libi2c/libi2c.h - ## serdbg if LIBSERDBG -include_rtems_HEADERS += libmisc/serdbg/serdbgcnf.h -include_rtems_HEADERS += libmisc/serdbg/serdbg.h -include_rtems_HEADERS += libmisc/serdbg/termios_printk_cnf.h -include_rtems_HEADERS += libmisc/serdbg/termios_printk.h endif ## stackchk -include_rtems_HEADERS += libmisc/stackchk/stackchk.h - ## libuntar -include_rtems_HEADERS += libmisc/untar/untar.h - ## fsmount -include_rtems_HEADERS += libmisc/fsmount/fsmount.h - -include_rtems_HEADERS += include/rtems/tm27-default.h - ## Driver manager if LIBDRVMGR -include_drvmgrdir = $(includedir)/drvmgr -include_drvmgr_HEADERS = libdrvmgr/drvmgr.h -include_drvmgr_HEADERS += libdrvmgr/drvmgr_confdefs.h -include_drvmgr_HEADERS += libdrvmgr/drvmgr_list.h endif if LIBGNAT -include_adaincludedir = $(includedir)/adainclude -include_adainclude_HEADERS = -include_adainclude_HEADERS += include/adainclude/rtems.adb -include_adainclude_HEADERS += include/adainclude/rtems.ads -include_adainclude_HEADERS += include/adainclude/rtems-barrier.adb -include_adainclude_HEADERS += include/adainclude/rtems-barrier.ads -include_adainclude_HEADERS += include/adainclude/rtems-clock.adb -include_adainclude_HEADERS += include/adainclude/rtems-clock.ads -include_adainclude_HEADERS += include/adainclude/rtems-cpu_usage.ads -include_adainclude_HEADERS += include/adainclude/rtems-event.adb -include_adainclude_HEADERS += include/adainclude/rtems-event.ads -include_adainclude_HEADERS += include/adainclude/rtems-extension.adb -include_adainclude_HEADERS += include/adainclude/rtems-extension.ads -include_adainclude_HEADERS += include/adainclude/rtems-fatal.adb -include_adainclude_HEADERS += include/adainclude/rtems-fatal.ads -include_adainclude_HEADERS += include/adainclude/rtems-interrupt.ads -include_adainclude_HEADERS += include/adainclude/rtems-io.adb -include_adainclude_HEADERS += include/adainclude/rtems-io.ads -include_adainclude_HEADERS += include/adainclude/rtems-message_queue.adb -include_adainclude_HEADERS += include/adainclude/rtems-message_queue.ads -include_adainclude_HEADERS += include/adainclude/rtems-multiprocessing.adb -include_adainclude_HEADERS += include/adainclude/rtems-multiprocessing.ads -include_adainclude_HEADERS += include/adainclude/rtems-object.adb -include_adainclude_HEADERS += include/adainclude/rtems-object.ads -include_adainclude_HEADERS += include/adainclude/rtems-partition.adb -include_adainclude_HEADERS += include/adainclude/rtems-partition.ads -include_adainclude_HEADERS += include/adainclude/rtems-port.adb -include_adainclude_HEADERS += include/adainclude/rtems-port.ads -include_adainclude_HEADERS += include/adainclude/rtems-rate_monotonic.adb -include_adainclude_HEADERS += include/adainclude/rtems-rate_monotonic.ads -include_adainclude_HEADERS += include/adainclude/rtems-region.adb -include_adainclude_HEADERS += include/adainclude/rtems-region.ads -include_adainclude_HEADERS += include/adainclude/rtems-semaphore.adb -include_adainclude_HEADERS += include/adainclude/rtems-semaphore.ads -include_adainclude_HEADERS += include/adainclude/rtems-signal.adb -include_adainclude_HEADERS += include/adainclude/rtems-signal.ads -include_adainclude_HEADERS += include/adainclude/rtems-stack_checker.ads -include_adainclude_HEADERS += include/adainclude/rtems-tasks.adb -include_adainclude_HEADERS += include/adainclude/rtems-tasks.ads -include_adainclude_HEADERS += include/adainclude/rtems-timer.adb -include_adainclude_HEADERS += include/adainclude/rtems-timer.ads endif ## HACK: doxygen filter. EXTRA_DIST = doxy-filter -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/acinclude.m4 b/cpukit/acinclude.m4 index da6084de90..f1889b6677 100644 --- a/cpukit/acinclude.m4 +++ b/cpukit/acinclude.m4 @@ -36,26 +36,27 @@ _ACEOF ]) AC_DEFUN([_RTEMS_CPUOPT_FINI],[ +AC_REQUIRE([RTEMS_BUILD_TOP]) cat >>cpuopts.tmp <<\_ACEOF #endif /* _RTEMS_SCORE_CPUOPTS_H */ _ACEOF -AS_MKDIR_P(score/include/rtems/score) -AS_IF([test -f score/include/rtems/score/cpuopts.h], +AS_MKDIR_P(${RTEMS_BUILD_ROOT}/include/rtems/score) +AS_IF([test -f ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h], [ - AS_IF([cmp -s score/include/rtems/score/cpuopts.h cpuopts.tmp 2>/dev/null], + AS_IF([cmp -s ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h cpuopts.tmp 2>/dev/null], [ - AC_MSG_NOTICE([score/include/rtems/score/cpuopts.h is unchanged]) + AC_MSG_NOTICE([${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h is unchanged]) rm -f cpuopts.tmp ],[ - AC_MSG_NOTICE([creating score/include/rtems/score/cpuopts.h]) - rm -f score/include/rtems/score/cpuopts.h - mv cpuopts.tmp score/include/rtems/score/cpuopts.h + AC_MSG_NOTICE([creating ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h]) + rm -f ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h + mv cpuopts.tmp ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h ]) ],[ - AC_MSG_NOTICE([creating score/include/rtems/score/cpuopts.h]) - rm -f score/include/rtems/score/cpuopts.h - mv cpuopts.tmp score/include/rtems/score/cpuopts.h + AC_MSG_NOTICE([creating ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h]) + rm -f ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h + mv cpuopts.tmp ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h ]) ]) diff --git a/cpukit/aclocal/prog-cc.m4 b/cpukit/aclocal/prog-cc.m4 index 659a682558..9006e0e53a 100644 --- a/cpukit/aclocal/prog-cc.m4 +++ b/cpukit/aclocal/prog-cc.m4 @@ -29,11 +29,10 @@ test "$rtems_cv_gcc_pipe" = "yes" && CC="$CC --pipe" AS_IF([test "$GCC" = yes && test "$rtems_cv_CFLAGS_set" != set], [CFLAGS="$CFLAGS -Wall -Wimplicit-function-declaration -Wstrict-prototypes -Wnested-externs"]) -RTEMS_CPPFLAGS="-I\$(top_builddir) -I\$(PROJECT_INCLUDE)" -AC_SUBST(RTEMS_CPPFLAGS) - AS_IF([test "$GCC" = yes],[ RTEMS_RELLDFLAGS="-qnolinkcmds -nostdlib -r" ]) AC_SUBST(RTEMS_RELLDFLAGS) + +RTEMS_INCLUDES ]) diff --git a/cpukit/aclocal/rtems-bsp-includes.m4 b/cpukit/aclocal/rtems-bsp-includes.m4 new file mode 100644 index 0000000000..394d50acd4 --- /dev/null +++ b/cpukit/aclocal/rtems-bsp-includes.m4 @@ -0,0 +1,23 @@ +dnl +dnl RTEMS Include paths. +dnl +AC_DEFUN([RTEMS_BSP_INCLUDES], +[ +AC_REQUIRE([RTEMS_SOURCE_TOP]) +AC_REQUIRE([RTEMS_BUILD_TOP]) + +RTEMS_BSP_INCLUDE_BSP="-I${RTEMS_SOURCE_ROOT}/bsps/include" +RTEMS_BSP_INCLUDE_BSP_ARCH="-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/include" +RTEMS_BSP_INCLUDE_BSP_ARCH_BSP="-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP)/include" +RTEMS_BSP_INCLUDE_BSP_FAMILY="-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include" +RTEMS_BSP_ARCH_INCLUDE="${RTEMS_BSP_INCLUDE_BSP} ${RTEMS_BSP_INCLUDE_BSP_ARCH}" +RTEMS_BSP_ARCH_INCLUDE="${RTEMS_BSP_ARCH_INCLUDE} ${RTEMS_BSP_INCLUDE_BSP_ARCH_BSP} ${RTEMS_BSP_INCLUDE_BSP_FAMILY}" + +RTEMS_BSP_BUILD_INCLUDE="-I${RTEMS_BUILD_ROOT}/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include" + +RTEMS_BSP_INCLUDE="${RTEMS_BSP_BUILD_INCLUDE} ${RTEMS_BSP_ARCH_INCLUDE}" + +RTEMS_BSP_CPPFLAGS="${RTEMS_BSP_INCLUDE}" + +AC_SUBST([RTEMS_BSP_CPPFLAGS]) +]) diff --git a/cpukit/aclocal/rtems-build-top.m4 b/cpukit/aclocal/rtems-build-top.m4 new file mode 100644 index 0000000000..5708119c14 --- /dev/null +++ b/cpukit/aclocal/rtems-build-top.m4 @@ -0,0 +1,12 @@ +dnl +dnl RTEMS_BUILD_TOP($1) +dnl +AC_DEFUN([RTEMS_BUILD_TOP], +[dnl +# +# This is a copy of the horrible hack in rtems-top.m4 and it is simpler to +# copy it that attempt to clean this crap up. +# +RTEMS_BUILD_ROOT="${with_rtems_build_top}" +AC_SUBST([RTEMS_BUILD_ROOT]) +])dnl diff --git a/cpukit/aclocal/rtems-includes.m4 b/cpukit/aclocal/rtems-includes.m4 new file mode 100644 index 0000000000..ca4ebed581 --- /dev/null +++ b/cpukit/aclocal/rtems-includes.m4 @@ -0,0 +1,23 @@ +dnl +dnl RTEMS Include paths. +dnl +AC_DEFUN([RTEMS_INCLUDES], +[ +AC_REQUIRE([RTEMS_SOURCE_TOP]) +AC_REQUIRE([RTEMS_BUILD_TOP]) + +# Was CFLAGS set? +rtems_cv_CFLAGS_set="${CFLAGS+set}" + +RTEMS_INCLUDE_CPUKIT="-I${RTEMS_SOURCE_ROOT}/cpukit/include" +RTEMS_INCLUDE_CPUKIT_ARCH="-I${RTEMS_SOURCE_ROOT}/cpukit/score/cpu/\$(RTEMS_CPU)/include" + +RTEMS_CPUKIT_INCLUDE="${RTEMS_INCLUDE_CPUKIT} ${RTEMS_INCLUDE_CPUKIT_ARCH}" +RTEMS_BUILD_INCLUDE="-I\$(top_builddir) -I${RTEMS_BUILD_ROOT}/include" + +RTEMS_INCLUDE="${RTEMS_BUILD_INCLUDE} ${RTEMS_CPUKIT_INCLUDE}" + +RTEMS_CPPFLAGS="${RTEMS_INCLUDE}" + +AC_SUBST([RTEMS_CPPFLAGS]) +]) diff --git a/cpukit/aclocal/rtems-source-top.m4 b/cpukit/aclocal/rtems-source-top.m4 new file mode 100644 index 0000000000..d1460ae82d --- /dev/null +++ b/cpukit/aclocal/rtems-source-top.m4 @@ -0,0 +1,8 @@ +dnl +dnl RTEMS_SOURCE_TOP +dnl +AC_DEFUN([RTEMS_SOURCE_TOP], +[dnl +RTEMS_SOURCE_ROOT="${with_rtems_source_top}" +AC_SUBST([RTEMS_SOURCE_ROOT]) +])dnl diff --git a/cpukit/automake/compile.am b/cpukit/automake/compile.am index ace3d9045b..4fc133e7aa 100644 --- a/cpukit/automake/compile.am +++ b/cpukit/automake/compile.am @@ -1,3 +1,5 @@ AM_CPPFLAGS = @RTEMS_CPPFLAGS@ AM_CFLAGS = AM_CCASFLAGS = @RTEMS_CCASFLAGS@ + +ARFLAGS = crD diff --git a/cpukit/automake/local.am b/cpukit/automake/local.am index c2bfbfdb98..3815a7d086 100644 --- a/cpukit/automake/local.am +++ b/cpukit/automake/local.am @@ -1,3 +1,2 @@ -preinstall-am: $(PREINSTALL_FILES) -preinstall: preinstall-am -.PHONY: preinstall preinstall-am + +all-local: $(TMPINSTALL_FILES) diff --git a/cpukit/automake/subdirs.am b/cpukit/automake/subdirs.am index 867704460f..8c7be70e60 100644 --- a/cpukit/automake/subdirs.am +++ b/cpukit/automake/subdirs.am @@ -14,29 +14,7 @@ SUBDIRS_no_dot = $(filter-out .,$(_SUBDIRS)) SUBDIRS_no_dot_no_wrapup = $(filter-out wrapup,$(SUBDIRS_no_dot)) SUBDIRS_wrapup = $(filter wrapup,$(SUBDIRS_no_dot)) -SUBDIR_TARGET = $(subst /,-,$1) -PREINSTALL_TARGET = preinstall-$(call SUBDIR_TARGET,$(1)) - -preintstall_targets = $(if "$(SUBDIRS_dot)" ".",preinstall-dot) $(foreach D,$(SUBDIRS_no_dot),$(call PREINSTALL_TARGET,$(D))) - -define PREINSTALL_DIR -.PHONY: $1 -$1: - @+set fnord $(MAKEFLAGS); amf=$$$$2; \ - subdir=$(2); \ - subdir_label=`echo $(1) | sed -e 's/preinstall-//'`; \ - target=`echo $$@ | sed -e 's/-recursive//' -e "s/-$$$${subdir_label}//"`$(3); \ - echo "Making $$$$target in $$$$subdir"; \ - (cd $$$$subdir && $(MAKE) $(AM_MAKEFLAGS) $$$$target) \ - || case "$$$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; -endef - -$(if "$(SUBDIRS_dot)" ".",$(eval $(call PREINSTALL_DIR,preinstall-dot,.,-am))) - -$(foreach D,$(SUBDIRS_no_dot),$(eval $(call PREINSTALL_DIR,$(call PREINSTALL_TARGET,$(D)),$(D)))) - preinstall: $(preintstall_targets) -.PHONY: preinstall define CPUKITDIR .PHONY: $1 @@ -71,4 +49,4 @@ $(foreach D,$(SUBDIRS_no_dot),$(eval $(call CPUKITDIR,$(D),$(D)))) # $(if "$(SUBDIRS_wrapup)" "wrapup",wrapup: dot $(foreach D,$(SUBDIRS_no_dot_no_wrapup),$(D)),) -all-local: preinstall $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot) +all-local: $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot) diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 382fee64a7..8435e138ea 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -4,13 +4,14 @@ AC_PREREQ([2.69]) AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([score]) RTEMS_TOP([..],[]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc subdir-objects foreign 1.12.2]) AM_MAINTAINER_MODE -RTEMS_ENABLE_MULTILIB RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_POSIX RTEMS_ENABLE_RTEMS_DEBUG @@ -489,9 +490,4 @@ pppd/Makefile mghttpd/Makefile wrapup/Makefile]) -AC_CONFIG_COMMANDS([preinstall-stamp], -[test -z "$with_multisubdir" && ${MAKE} preinstall-stamp], -[MAKE=${MAKE} -with_multisubdir="$with_multisubdir"]) - AC_OUTPUT diff --git a/cpukit/dev/Makefile.am b/cpukit/dev/Makefile.am index b60e035fdb..f499bbb948 100644 --- a/cpukit/dev/Makefile.am +++ b/cpukit/dev/Makefile.am @@ -1,39 +1,6 @@ include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/multilib.am -include_devdir = $(includedir)/dev -include_dev_HEADERS = - -include_dev_i2cdir = $(includedir)/dev/i2c -include_dev_i2c_HEADERS = -include_dev_i2c_HEADERS += include/dev/i2c/eeprom.h -include_dev_i2c_HEADERS += include/dev/i2c/fpga-i2c-slave.h -include_dev_i2c_HEADERS += include/dev/i2c/gpio-nxp-pca9535.h -include_dev_i2c_HEADERS += include/dev/i2c/i2c.h -include_dev_i2c_HEADERS += include/dev/i2c/sensor-lm75a.h -include_dev_i2c_HEADERS += include/dev/i2c/switch-nxp-pca9548a.h -include_dev_i2c_HEADERS += include/dev/i2c/xilinx-axi-i2c.h -include_dev_i2c_HEADERS += include/dev/i2c/ti-ads-16bit-adc.h -include_dev_i2c_HEADERS += include/dev/i2c/ti-lm25066a.h -include_dev_i2c_HEADERS += include/dev/i2c/ti-tmp112.h - -include_dev_spidir = $(includedir)/dev/spi -include_dev_spi_HEADERS = -include_dev_spi_HEADERS += include/dev/spi/spi.h - -include_dev_serialdir = $(includedir)/dev/serial -include_dev_serial_HEADERS = -include_dev_serial_HEADERS += include/dev/serial/sc16is752.h - -include_linuxdir = $(includedir)/linux -include_linux_HEADERS = -include_linux_HEADERS += include/linux/i2c.h -include_linux_HEADERS += include/linux/i2c-dev.h - -include_linux_spidir = $(includedir)/linux/spi -include_linux_spi_HEADERS = -include_linux_spi_HEADERS += include/linux/spi/spidev.h - noinst_LIBRARIES = libdev.a libdev_a_SOURCES = @@ -53,5 +20,4 @@ libdev_a_SOURCES += serial/sc16is752.c libdev_a_SOURCES += serial/sc16is752-spi.c libdev_a_SOURCES += serial/sc16is752-regs.h -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/dtc/libfdt/Makefile.am b/cpukit/dtc/libfdt/Makefile.am index 687d226f0f..0782303891 100644 --- a/cpukit/dtc/libfdt/Makefile.am +++ b/cpukit/dtc/libfdt/Makefile.am @@ -1,7 +1,5 @@ include $(top_srcdir)/automake/compile.am -include_HEADERS = fdt.h libfdt.h libfdt_env.h - noinst_LIBRARIES = libfdt.a libfdt_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir) @@ -15,5 +13,4 @@ libfdt_a_SOURCES += fdt_strerror.c libfdt_a_SOURCES += fdt_sw.c libfdt_a_SOURCES += fdt_wip.c -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am index 24a2815a97..fbb78650d6 100644 --- a/cpukit/ftpd/Makefile.am +++ b/cpukit/ftpd/Makefile.am @@ -2,8 +2,12 @@ include $(top_srcdir)/automake/compile.am if LIBNETWORKING project_lib_LIBRARIES = libftpd.a + +$(PROJECT_LIB)/libftpd.a: libftpd.a + $(INSTALL_DATA) $< $(PROJECT_LIB)/libftpd.a +TMPINSTALL_FILES = $(PROJECT_LIB)/libftpd.a + libftpd_a_SOURCES = ftpd.c ftpd.h endif -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libcrypt/Makefile.am b/cpukit/libcrypt/Makefile.am index fe174d4e9d..cb8dbe129a 100644 --- a/cpukit/libcrypt/Makefile.am +++ b/cpukit/libcrypt/Makefile.am @@ -1,7 +1,5 @@ include $(top_srcdir)/automake/compile.am -include_HEADERS = - noinst_LIBRARIES = libcrypt.a libcrypt_a_CPPFLAGS = $(AM_CPPFLAGS) @@ -13,5 +11,4 @@ libcrypt_a_SOURCES += crypt-sha256.c libcrypt_a_SOURCES += crypt-sha512.c libcrypt_a_SOURCES += misc.c -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index 038ac93548..253c2c9924 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -5,32 +5,7 @@ noinst_LIBRARIES = libcsupport.a libcalloc.a libcsupport_a_CPPFLAGS = $(AM_CPPFLAGS) libcalloc_a_CPPFLAGS = $(AM_CPPFLAGS) -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = include/iosupp.h -include_rtems_HEADERS += include/ringbuf.h -include_rtems_HEADERS += include/rtems/tod.h -include_rtems_HEADERS += include/spurious.h -include_rtems_HEADERS += include/vmeintr.h - ## rtems -include_rtems_HEADERS += include/rtems/assoc.h -include_rtems_HEADERS += include/rtems/deviceio.h -include_rtems_HEADERS += include/rtems/error.h -include_rtems_HEADERS += include/rtems/libcsupport.h -include_rtems_HEADERS += include/rtems/libio.h -include_rtems_HEADERS += include/rtems/libio_.h -include_rtems_HEADERS += include/rtems/malloc.h -include_rtems_HEADERS += include/rtems/termiostypes.h -include_rtems_HEADERS += include/rtems/gxx_wrappers.h - -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += include/machine/_kernel_cpuset.h -include_machine_HEADERS += include/machine/_kernel_param.h -include_machine_HEADERS += include/machine/_kernel_time.h -include_machine_HEADERS += include/machine/_kernel_types.h -include_machine_HEADERS += include/machine/_timecounter.h - ## General stuff ERROR_C_FILES = src/error.c src/__assert.c @@ -157,5 +132,4 @@ libcalloc_a_CFLAGS = -fno-builtin EXTRA_DIST = src/TODO src/CASES src/README -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libdebugger/Makefile.am b/cpukit/libdebugger/Makefile.am index 72a89447d7..b202003e41 100644 --- a/cpukit/libdebugger/Makefile.am +++ b/cpukit/libdebugger/Makefile.am @@ -1,7 +1,7 @@ -if LIBDEBUGGER - include $(top_srcdir)/automake/compile.am +if LIBDEBUGGER + noinst_LIBRARIES = libdebugger.a libdebugger_a_SOURCES = \ rtems-debugger-block.c \ @@ -19,5 +19,4 @@ endif endif -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libdl/Makefile.am b/cpukit/libdl/Makefile.am index b21c16750a..8b95a7d91c 100644 --- a/cpukit/libdl/Makefile.am +++ b/cpukit/libdl/Makefile.am @@ -1,7 +1,7 @@ -if LIBDL - include $(top_srcdir)/automake/compile.am +if LIBDL + noinst_LIBRARIES = libdl.a libdl_a_SOURCES = \ dlfcn-shell.c \ @@ -33,5 +33,4 @@ libdl_a_CPPFLAGS = $(AM_CPPFLAGS) -DRTEMS_RTL_RAP_LOADER=1 -DRTEMS_RTL_ELF_LOADE endif -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am index 0985b2ffb4..a76fa8ae2d 100644 --- a/cpukit/libfs/Makefile.am +++ b/cpukit/libfs/Makefile.am @@ -112,6 +112,11 @@ librfs_a_SOURCES = \ # JFFS2 project_lib_LIBRARIES = libjffs2.a + +$(PROJECT_LIB)/libjffs2.a: libjffs2.a + $(INSTALL_DATA) $< $(PROJECT_LIB)/libjffs2.a +TMPINSTALL_FILES = $(PROJECT_LIB)/libjffs2.a + libjffs2_a_SOURCES = libjffs2_a_SOURCES += src/jffs2/src/build.c libjffs2_a_SOURCES += src/jffs2/src/compat-crc32.c @@ -139,6 +144,5 @@ libjffs2_a_CPPFLAGS += -D__ECOS libjffs2_a_CPPFLAGS += '-DKBUILD_MODNAME="JFFS2"' # --- -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libfs/src/nfsclient/Makefile.am b/cpukit/libfs/src/nfsclient/Makefile.am index 85f4a71756..04d840f507 100644 --- a/cpukit/libfs/src/nfsclient/Makefile.am +++ b/cpukit/libfs/src/nfsclient/Makefile.am @@ -10,6 +10,11 @@ dirutils_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if LIBNETWORKING project_lib_LIBRARIES = libnfs.a +$(PROJECT_LIB)/libnfs.a: libnfs.a + $(INSTALL_DATA) $< $(PROJECT_LIB)/libnfs.a +TMPINSTALL_FILES = $(PROJECT_LIB)/libnfs.a + + # if you have CEXP set this variable to 'YES' # and some "help" info will be compiled in. libnfs_a_SOURCES = src/rpcio.c src/rpcio.h @@ -19,8 +24,6 @@ libnfs_a_SOURCES += proto/mount_prot.h proto/nfs_prot.h # With CEXP # libnfs_a_SOURCES += dirutils.c rpcio.modini.c nfs.modini.c cexphelp.c -include_HEADERS = src/librtemsNfs.h - # PGMS=${ARCH}/nfs.obj ${ARCH}/rpcio.obj ${ARCH}/dirutils.obj libnfs_a_CPPFLAGS = $(AM_CPPFLAGS) @@ -66,5 +69,4 @@ $(srcdir)/proto/nfs_prot_xdr.c: proto/nfs_prot.x proto/nfs_prot.h > nfs_prot_xdr.c) endif -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmd/Makefile.am b/cpukit/libmd/Makefile.am index 2d3f2e1ad2..b56aff7ca5 100644 --- a/cpukit/libmd/Makefile.am +++ b/cpukit/libmd/Makefile.am @@ -1,12 +1,6 @@ include $(top_srcdir)/automake/compile.am if NEWLIB -include_HEADERS = -include_HEADERS += md4.h -include_HEADERS += md5.h -include_HEADERS += sha256.h -include_HEADERS += sha512.h - noinst_LIBRARIES = libmd.a libmd_a_SOURCES = libmd_a_SOURCES += md4.c @@ -18,5 +12,4 @@ endif libmd_a_CPPFLAGS = $(AM_CPPFLAGS) endif -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am index e1343ddf11..ca4686a954 100644 --- a/cpukit/libmisc/Makefile.am +++ b/cpukit/libmisc/Makefile.am @@ -208,5 +208,4 @@ libxz_a_SOURCES = xz/xz/h xz/xz_crc32.c \ EXTRA_DIST += xz/README xz/COPING ## --- -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am index d6c8af89dd..a107b65348 100644 --- a/cpukit/libnetworking/Makefile.am +++ b/cpukit/libnetworking/Makefile.am @@ -22,8 +22,6 @@ libnetworking_a_CPPFLAGS = $(AM_CPPFLAGS) $(libnetworking_CPPFLAGS) ## poll.h is not in the list because RTEMS does not have poll() ## and installing poll.h confuses autoconf. -include_HEADERS = resolv.h - libnetworking_a_SOURCES = opt_atalk.h opt_bdg.h opt_compat.h opt_inet6.h \ opt_inet.h opt_ipfw.h opt_ipx.h opt_mac.h opt_mrouting.h opt_netgraph.h \ opt_tcpdebug.h opt_ipsec.h loop.h @@ -32,12 +30,6 @@ libnetworking_a_SOURCES += bpfilter.h # arpa -include_arpadir = $(includedir)/arpa - -include_arpa_HEADERS = arpa/ftp.h -include_arpa_HEADERS += arpa/nameser.h -include_arpa_HEADERS += arpa/nameser_compat.h - ## kern libnetworking_a_SOURCES += kern/kern_mib.c kern/kern_subr.c \ @@ -46,68 +38,16 @@ libnetworking_a_SOURCES += kern/kern_mib.c kern/kern_subr.c \ ## machine -include_machinedir = $(includedir)/machine - -include_machine_HEADERS = machine/_align.h -include_machine_HEADERS += machine/cpu.h -include_machine_HEADERS += machine/cpufunc.h -include_machine_HEADERS += machine/in_cksum.h -include_machine_HEADERS += machine/_kernel_lock.h -include_machine_HEADERS += machine/vmparam.h - libnetworking_a_SOURCES += machine/limits.h ## net -include_netdir = $(includedir)/net - -include_net_HEADERS = net/bpf.h -include_net_HEADERS += net/ethernet.h -include_net_HEADERS += net/if_arp.h -include_net_HEADERS += net/if_dl.h -include_net_HEADERS += net/if_llc.h -include_net_HEADERS += net/if_ppp.h -include_net_HEADERS += net/if_types.h -include_net_HEADERS += net/if_var.h -include_net_HEADERS += net/netisr.h -include_net_HEADERS += net/ppp_defs.h -include_net_HEADERS += net/radix.h -include_net_HEADERS += net/raw_cb.h -include_net_HEADERS += net/route.h -include_net_HEADERS += net/if_pppvar.h -include_net_HEADERS += net/slcompress.h -include_net_HEADERS += net/if_media.h -include_net_HEADERS += net/ppp_comp.h - libnetworking_a_SOURCES += net/if.c net/if_ethersubr.c net/if_loop.c \ net/radix.c net/route.c net/rtsock.c net/raw_cb.c net/raw_usrreq.c \ net/if_ppp.c net/ppp_tty.c net/slcompress.c ## netinet -include_netinetdir = $(includedir)/netinet - -include_netinet_HEADERS = netinet/icmp_var.h -include_netinet_HEADERS += netinet/if_ether.h -include_netinet_HEADERS += netinet/igmp.h -include_netinet_HEADERS += netinet/igmp_var.h -include_netinet_HEADERS += netinet/in_pcb.h -include_netinet_HEADERS += netinet/in_systm.h -include_netinet_HEADERS += netinet/in_var.h -include_netinet_HEADERS += netinet/ip.h -include_netinet_HEADERS += netinet/ip_fw.h -include_netinet_HEADERS += netinet/ip_icmp.h -include_netinet_HEADERS += netinet/ip_mroute.h -include_netinet_HEADERS += netinet/ip_var.h -include_netinet_HEADERS += netinet/tcp_debug.h -include_netinet_HEADERS += netinet/tcp_fsm.h -include_netinet_HEADERS += netinet/tcp_seq.h -include_netinet_HEADERS += netinet/tcp_timer.h -include_netinet_HEADERS += netinet/tcp_var.h -include_netinet_HEADERS += netinet/tcpip.h -include_netinet_HEADERS += netinet/udp.h -include_netinet_HEADERS += netinet/udp_var.h - libnetworking_a_SOURCES += netinet/if_ether.c netinet/igmp.c netinet/in.c \ netinet/in_cksum.c netinet/in_pcb.c netinet/in_proto.c netinet/in_rmx.c \ netinet/ip_divert.c netinet/ip_fw.c netinet/ip_icmp.c netinet/ip_input.c \ @@ -119,40 +59,14 @@ libnetworking_a_SOURCES += netinet/if_ether.c netinet/igmp.c netinet/in.c \ ## netinet6 -include_netinet6dir = $(includedir)/netinet6 - ## nfs -include_nfsdir = $(includedir)/nfs - -include_nfs_HEADERS = nfs/nfsproto.h -include_nfs_HEADERS += nfs/rpcv2.h -include_nfs_HEADERS += nfs/xdr_subs.h - libnetworking_a_SOURCES += nfs/bootp_subr.c ## nfsclient -include_nfsclientdir = $(includedir)/nfsclient - -include_nfsclient_HEADERS = nfsclient/nfsargs.h -include_nfsclient_HEADERS += nfsclient/nfsdiskless.h - ## rtems -include_rtemsdir = $(includedir)/rtems - -include_rtems_HEADERS = rtems/rtems_bsdnet.h -include_rtems_HEADERS += rtems/rtems_bsdnet_internal.h -include_rtems_HEADERS += rtems/dhcp.h -include_rtems_HEADERS += rtems/rtems_dhcp_failsafe.h -include_rtems_HEADERS += rtems/tftp.h -include_rtems_HEADERS += rtems/ftpfs.h -include_rtems_HEADERS += rtems/mkrootfs.h -include_rtems_HEADERS += rtems/rtems_mii_ioctl.h -include_rtems_HEADERS += rtems/rtems_netdb.h -include_rtems_HEADERS += rtems/rtems_netinet_in.h - libnetworking_a_SOURCES += rtems/sghostname.c \ rtems/rtems_glue.c rtems/rtems_malloc_mbuf.c rtems/rtems_syscall.c \ rtems/rtems_bootp.c rtems/rtems_dhcp.c rtems/rtems_dhcp_failsafe.c \ @@ -165,41 +79,9 @@ libnetworking_a_SOURCES += rtems/sghostname.c \ ## sys -include_sysdir = $(includedir)/sys - -include_sys_HEADERS = sys/callout.h -include_sys_HEADERS += sys/conf.h -include_sys_HEADERS += sys/domain.h -include_sys_HEADERS += sys/kernel.h -include_sys_HEADERS += sys/libkern.h -include_sys_HEADERS += sys/linker_set.h -include_sys_HEADERS += sys/malloc.h -include_sys_HEADERS += sys/mbuf.h -include_sys_HEADERS += sys/mount.h -include_sys_HEADERS += sys/proc.h -include_sys_HEADERS += sys/protosw.h -include_sys_HEADERS += sys/reboot.h -include_sys_HEADERS += sys/resourcevar.h -include_sys_HEADERS += sys/selinfo.h -include_sys_HEADERS += sys/signalvar.h -include_sys_HEADERS += sys/socketvar.h -include_sys_HEADERS += sys/sysctl.h -include_sys_HEADERS += sys/systm.h -include_sys_HEADERS += sys/ucred.h - # vm -include_vmdir = $(includedir)/vm - -include_vm_HEADERS = vm/vm.h -include_vm_HEADERS += vm/vm_extern.h -include_vm_HEADERS += vm/vm_kern.h -include_vm_HEADERS += vm/vm_param.h - # dev -include_dev_miidir = $(includedir)/dev/mii -include_dev_mii_HEADERS = dev/mii/mii.h - ## libc libc_CPPFLAGS = -DNOPOLL -DNOSELECT -D__BSD_VISIBLE -D_THREAD_SAFE @@ -207,8 +89,6 @@ libc_CPPFLAGS = -DNOPOLL -DNOSELECT -D__BSD_VISIBLE -D_THREAD_SAFE noinst_LIBRARIES += libc.a libc_a_CPPFLAGS = $(AM_CPPFLAGS) $(libc_CPPFLAGS) -include_HEADERS += ifaddrs.h - libc_a_SOURCES = libc/base64.c \ libc/gethostbydns.c libc/gethostbyht.c libc/gethostbynis.c \ libc/gethostnamadr.c libc/getnetbydns.c libc/getnetbyht.c \ @@ -259,5 +139,4 @@ endif EXTRA_DIST += $(UNUSED_FILES) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libpci/Makefile.am b/cpukit/libpci/Makefile.am index cff25b35c0..f762d39f8e 100644 --- a/cpukit/libpci/Makefile.am +++ b/cpukit/libpci/Makefile.am @@ -6,14 +6,6 @@ if LIBPCI EXTRA_DIST= ## PCI Library -include_HEADERS = pci.h -include_pcidir = $(includedir)/pci -include_pci_HEADERS = pci/access.h pci/cfg.h \ - pci/cfg_auto.h pci/cfg_static.h \ - pci/cfg_peripheral.h pci/cfg_read.h \ - pci/ids.h pci/ids_extra.h pci/irq.h \ - pci/pcireg.h - noinst_LIBRARIES = libpci.a libpci_a_SOURCES = pci_access.c @@ -39,10 +31,6 @@ libpci_a_SOURCES += pci_print.c # Driver manager PCI bus libpci_a_SOURCES += pci_bus.c -include_drvmgrdir = $(includedir)/drvmgr -include_drvmgr_HEADERS = pci_bus.h - endif -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am index edc760fc7d..92a76ba7ff 100644 --- a/cpukit/librpc/Makefile.am +++ b/cpukit/librpc/Makefile.am @@ -4,26 +4,6 @@ include $(top_srcdir)/automake/compile.am EXTRA_DIST = if LIBRPC -include_rpcdir = $(includedir)/rpc - -include_rpc_HEADERS = include/rpc/auth.h -include_rpc_HEADERS += include/rpc/auth_unix.h -include_rpc_HEADERS += include/rpc/clnt.h -include_rpc_HEADERS += include/rpc/clnt_stat.h -include_rpc_HEADERS += include/rpc/clnt_soc.h -include_rpc_HEADERS += include/rpc/svc.h -include_rpc_HEADERS += include/rpc/svc_auth.h -include_rpc_HEADERS += include/rpc/svc_soc.h -include_rpc_HEADERS += include/rpc/pmap_clnt.h -include_rpc_HEADERS += include/rpc/pmap_prot.h -include_rpc_HEADERS += include/rpc/pmap_rmt.h -include_rpc_HEADERS += include/rpc/rpc.h -include_rpc_HEADERS += include/rpc/types.h -include_rpc_HEADERS += include/rpc/xdr.h -include_rpc_HEADERS += include/rpc/rpc_com.h -include_rpc_HEADERS += include/rpc/rpc_msg.h -include_rpc_HEADERS += include/rpc/rpcent.h - man_MANS = noinst_LIBRARIES = libxdr.a @@ -90,5 +70,4 @@ EXTRA_DIST += include/rpcsvc/bootparam_prot.x include/rpcsvc/crypt.x \ include/rpcsvc/ypupdate_prot.x include/rpcsvc/yp.x \ include/rpcsvc/ypxfrd.x -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libstdthreads/Makefile.am b/cpukit/libstdthreads/Makefile.am index b6b9138063..7d6192724d 100644 --- a/cpukit/libstdthreads/Makefile.am +++ b/cpukit/libstdthreads/Makefile.am @@ -1,7 +1,5 @@ include $(top_srcdir)/automake/compile.am -include_HEADERS = - noinst_LIBRARIES = libstdthreads.a libstdthreads_a_CFLAGS = -std=c11 diff --git a/cpukit/mghttpd/Makefile.am b/cpukit/mghttpd/Makefile.am index bb5f84ba16..c3e605c679 100644 --- a/cpukit/mghttpd/Makefile.am +++ b/cpukit/mghttpd/Makefile.am @@ -2,17 +2,18 @@ include $(top_srcdir)/automake/compile.am if LIBNETWORKING if HAS_PTHREADS -include_mghttpddir = $(includedir)/mghttpd - project_lib_LIBRARIES = libmghttpd.a + +$(PROJECT_LIB)/libmghttpd.a: libmghttpd.a + $(INSTALL_DATA) $< $(PROJECT_LIB)/libmghttpd.a +TMPINSTALL_FILES = $(PROJECT_LIB)/libmghttpd.a + libmghttpd_a_CPPFLAGS = $(AM_CPPFLAGS) # libmghttpd_a_CPPFLAGS += -DHAVE_MD5 libmghttpd_a_CPPFLAGS += -DNO_SSL -DNO_POPEN -DNO_CGI -DUSE_WEBSOCKET libmghttpd_a_SOURCES = mongoose.c mongoose.h -include_mghttpd_HEADERS = mongoose.h endif endif -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am index 351dc714f8..1c127e1ae2 100644 --- a/cpukit/posix/Makefile.am +++ b/cpukit/posix/Makefile.am @@ -11,46 +11,10 @@ libposix_a_SOURCES = libposix_a_SOURCES += src/nanosleep.c src/clockgettime.c src/clocksettime.c \ src/clockgetres.c src/sysconf.c -include_rtems_posixdir = $(includedir)/rtems/posix - -include_rtems_posix_HEADERS = include/rtems/posix/sigset.h - ## Some POSIX threads features are needed all the time -include_rtems_posix_HEADERS += include/rtems/posix/barrierimpl.h -include_rtems_posix_HEADERS += include/rtems/posix/condimpl.h -include_rtems_posix_HEADERS += include/rtems/posix/key.h -include_rtems_posix_HEADERS += include/rtems/posix/keyimpl.h -include_rtems_posix_HEADERS += include/rtems/posix/config.h -include_rtems_posix_HEADERS += include/rtems/posix/muteximpl.h -include_rtems_posix_HEADERS += include/rtems/posix/posixapi.h -include_rtems_posix_HEADERS += include/rtems/posix/priorityimpl.h -include_rtems_posix_HEADERS += include/rtems/posix/pthreadattrimpl.h -include_rtems_posix_HEADERS += include/rtems/posix/rwlockimpl.h -include_rtems_posix_HEADERS += include/rtems/posix/semaphore.h -include_rtems_posix_HEADERS += include/rtems/posix/semaphoreimpl.h -include_rtems_posix_HEADERS += include/rtems/posix/spinlockimpl.h - if HAS_PTHREADS # include -include_HEADERS = include/aio.h -include_HEADERS += include/mqueue.h - # include/rtems/posix -include_rtems_posix_HEADERS += include/rtems/posix/aio_misc.h -include_rtems_posix_HEADERS += include/rtems/posix/mmanimpl.h -include_rtems_posix_HEADERS += include/rtems/posix/mqueue.h -include_rtems_posix_HEADERS += include/rtems/posix/mqueueimpl.h -include_rtems_posix_HEADERS += include/rtems/posix/psignal.h -include_rtems_posix_HEADERS += include/rtems/posix/psignalimpl.h -include_rtems_posix_HEADERS += include/rtems/posix/pthread.h -include_rtems_posix_HEADERS += include/rtems/posix/pthreadimpl.h -include_rtems_posix_HEADERS += include/rtems/posix/ptimer.h -include_rtems_posix_HEADERS += include/rtems/posix/shm.h -include_rtems_posix_HEADERS += include/rtems/posix/shmimpl.h -include_rtems_posix_HEADERS += include/rtems/posix/threadsup.h -include_rtems_posix_HEADERS += include/rtems/posix/timer.h -include_rtems_posix_HEADERS += include/rtems/posix/timerimpl.h - ## src libposix_a_SOURCES += src/aio_cancel.c src/aio_error.c src/aio_fsync.c \ src/aio_read.c src/aio_return.c src/aio_suspend.c src/aio_write.c \ @@ -236,5 +200,4 @@ endif libposix_a_SOURCES += src/sched_getprioritymin.c libposix_a_SOURCES += src/sched_getprioritymax.c -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/pppd/Makefile.am b/cpukit/pppd/Makefile.am index 2cf38edc69..53a05761f4 100644 --- a/cpukit/pppd/Makefile.am +++ b/cpukit/pppd/Makefile.am @@ -1,10 +1,12 @@ include $(top_srcdir)/automake/compile.am if LIBNETWORKING -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtemspppd.h rtemsdialer.h - project_lib_LIBRARIES = libpppd.a + +$(PROJECT_LIB)/libpppd.a: libpppd.a + $(INSTALL_DATA) $< $(PROJECT_LIB)/libpppd.a +TMPINSTALL_FILES = $(PROJECT_LIB)/libpppd.a + libpppd_a_SOURCES = auth.c ccp.c ccp.h chap.c chap.h chap_ms.c chap_ms.h \ chat.c demand.c fsm.c fsm.h ipcp.c ipcp.h lcp.c lcp.h magic.c magic.h \ options.c upap.c upap.h utils.c sys-rtems.c \ @@ -13,5 +15,4 @@ libpppd_a_SOURCES = auth.c ccp.c ccp.h chap.c chap.h chap_ms.c chap_ms.h \ libpppd_a_CPPFLAGS = $(AM_CPPFLAGS) -D__BSD_VISIBLE -I$(srcdir)/../libmd endif -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index da6e302e2e..b8694b8022 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -6,63 +6,9 @@ librtems_a_CPPFLAGS = $(AM_CPPFLAGS) # include -include_HEADERS = include/rtems.h - # include/rtems/rtems -include_rtems_rtemsdir = $(includedir)/rtems/rtems -include_rtems_rtems_HEADERS = - -include_rtems_rtems_HEADERS += include/rtems/rtems/asr.h -include_rtems_rtems_HEADERS += include/rtems/rtems/asrimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/attr.h -include_rtems_rtems_HEADERS += include/rtems/rtems/attrimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/barrier.h -include_rtems_rtems_HEADERS += include/rtems/rtems/barrierimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/cache.h -include_rtems_rtems_HEADERS += include/rtems/rtems/clock.h -include_rtems_rtems_HEADERS += include/rtems/rtems/config.h -include_rtems_rtems_HEADERS += include/rtems/rtems/dpmem.h -include_rtems_rtems_HEADERS += include/rtems/rtems/dpmemimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/event.h -include_rtems_rtems_HEADERS += include/rtems/rtems/eventimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/intr.h -include_rtems_rtems_HEADERS += include/rtems/rtems/message.h -include_rtems_rtems_HEADERS += include/rtems/rtems/messageimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/modes.h -include_rtems_rtems_HEADERS += include/rtems/rtems/modesimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/object.h -include_rtems_rtems_HEADERS += include/rtems/rtems/options.h -include_rtems_rtems_HEADERS += include/rtems/rtems/optionsimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/part.h -include_rtems_rtems_HEADERS += include/rtems/rtems/partimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/ratemon.h -include_rtems_rtems_HEADERS += include/rtems/rtems/ratemonimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/region.h -include_rtems_rtems_HEADERS += include/rtems/rtems/regionimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/sem.h -include_rtems_rtems_HEADERS += include/rtems/rtems/semimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/signal.h -include_rtems_rtems_HEADERS += include/rtems/rtems/signalimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/smp.h -include_rtems_rtems_HEADERS += include/rtems/rtems/status.h -include_rtems_rtems_HEADERS += include/rtems/rtems/statusimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/support.h -include_rtems_rtems_HEADERS += include/rtems/rtems/tasks.h -include_rtems_rtems_HEADERS += include/rtems/rtems/tasksimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/timer.h -include_rtems_rtems_HEADERS += include/rtems/rtems/timerimpl.h -include_rtems_rtems_HEADERS += include/rtems/rtems/types.h -include_rtems_rtems_HEADERS += mainpage.h - if HAS_MP ## We only build multiprocessing related files if HAS_MP was defined -include_rtems_rtems_HEADERS += include/rtems/rtems/eventmp.h -include_rtems_rtems_HEADERS += include/rtems/rtems/mp.h -include_rtems_rtems_HEADERS += include/rtems/rtems/msgmp.h -include_rtems_rtems_HEADERS += include/rtems/rtems/partmp.h -include_rtems_rtems_HEADERS += include/rtems/rtems/semmp.h -include_rtems_rtems_HEADERS += include/rtems/rtems/signalmp.h -include_rtems_rtems_HEADERS += include/rtems/rtems/taskmp.h endif ## src @@ -252,5 +198,4 @@ librtems_a_SOURCES += src/signalmp.c librtems_a_SOURCES += src/taskmp.c endif -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am index 326d67f193..4fb7c708cd 100644 --- a/cpukit/sapi/Makefile.am +++ b/cpukit/sapi/Makefile.am @@ -1,29 +1,6 @@ include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.am -include_rtemsdir = $(includedir)/rtems - -include_rtems_HEADERS = include/confdefs.h -include_rtems_HEADERS += include/rtems/bsd.h -include_rtems_HEADERS += include/rtems/chain.h -include_rtems_HEADERS += include/rtems/config.h -include_rtems_HEADERS += include/rtems/counter.h -include_rtems_HEADERS += include/rtems/extension.h -include_rtems_HEADERS += include/rtems/extensionimpl.h -include_rtems_HEADERS += include/rtems/fatal.h -include_rtems_HEADERS += include/rtems/init.h -include_rtems_HEADERS += include/rtems/io.h -include_rtems_HEADERS += include/rtems/ioimpl.h -include_rtems_HEADERS += include/rtems/mptables.h -include_rtems_HEADERS += include/rtems/cbs.h -include_rtems_HEADERS += include/rtems/profiling.h -include_rtems_HEADERS += include/rtems/rbheap.h -include_rtems_HEADERS += include/rtems/rbtree.h -include_rtems_HEADERS += include/rtems/scheduler.h -include_rtems_HEADERS += include/rtems/timecounter.h -include_rtems_HEADERS += include/rtems/timespec.h -include_rtems_HEADERS += include/rtems/version.h - EXTRA_DIST = include/rtems/README noinst_LIBRARIES = libsapi.a @@ -84,5 +61,4 @@ $(srcdir)/src/version.c: version-vc-key.h all-local: generate-vc-key -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index b7edf09dde..17f30b14c3 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -5,132 +5,11 @@ _SUBDIRS = cpu ## include -include_sysdir = $(includedir)/sys - -include_sys_HEADERS = -include_sys_HEADERS += include/sys/_ffcounter.h -include_sys_HEADERS += include/sys/timeffc.h -include_sys_HEADERS += include/sys/timepps.h -include_sys_HEADERS += include/sys/timetc.h -include_sys_HEADERS += include/sys/timex.h - -include_rtemsdir = $(includedir)/rtems - -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/linkersets.h -include_rtems_HEADERS += include/rtems/sysinit.h -include_rtems_HEADERS += include/rtems/system.h -include_rtems_HEADERS += include/rtems/seterr.h - -include_rtems_scoredir = $(includedir)/rtems/score - -include_rtems_score_HEADERS = include/rtems/score/address.h -include_rtems_score_HEADERS += include/rtems/score/apimutex.h -include_rtems_score_HEADERS += include/rtems/score/assert.h -include_rtems_score_HEADERS += include/rtems/score/atomic.h -include_rtems_score_HEADERS += include/rtems/score/chain.h -include_rtems_score_HEADERS += include/rtems/score/chainimpl.h -include_rtems_score_HEADERS += include/rtems/score/context.h -include_rtems_score_HEADERS += include/rtems/score/copyrt.h -include_rtems_score_HEADERS += include/rtems/score/corebarrier.h -include_rtems_score_HEADERS += include/rtems/score/corebarrierimpl.h -include_rtems_score_HEADERS += include/rtems/score/coremsg.h -include_rtems_score_HEADERS += include/rtems/score/coremsgimpl.h -include_rtems_score_HEADERS += include/rtems/score/coremutex.h -include_rtems_score_HEADERS += include/rtems/score/coremuteximpl.h -include_rtems_score_HEADERS += include/rtems/score/corerwlockimpl.h -include_rtems_score_HEADERS += include/rtems/score/coresem.h -include_rtems_score_HEADERS += include/rtems/score/coresemimpl.h -include_rtems_score_HEADERS += include/rtems/score/cpustdatomic.h -include_rtems_score_HEADERS += include/rtems/score/heap.h -include_rtems_score_HEADERS += include/rtems/score/heapimpl.h -include_rtems_score_HEADERS += include/rtems/score/protectedheap.h -include_rtems_score_HEADERS += include/rtems/score/interr.h -include_rtems_score_HEADERS += include/rtems/score/io.h -include_rtems_score_HEADERS += include/rtems/score/isr.h -include_rtems_score_HEADERS += include/rtems/score/isrlevel.h -include_rtems_score_HEADERS += include/rtems/score/isrlock.h -include_rtems_score_HEADERS += include/rtems/score/freechain.h -include_rtems_score_HEADERS += include/rtems/score/mrsp.h -include_rtems_score_HEADERS += include/rtems/score/mrspimpl.h -include_rtems_score_HEADERS += include/rtems/score/muteximpl.h -include_rtems_score_HEADERS += include/rtems/score/object.h -include_rtems_score_HEADERS += include/rtems/score/objectimpl.h -include_rtems_score_HEADERS += include/rtems/score/onceimpl.h -include_rtems_score_HEADERS += include/rtems/score/percpu.h -include_rtems_score_HEADERS += include/rtems/score/priority.h -include_rtems_score_HEADERS += include/rtems/score/priorityimpl.h -include_rtems_score_HEADERS += include/rtems/score/prioritybitmap.h -include_rtems_score_HEADERS += include/rtems/score/prioritybitmapimpl.h -include_rtems_score_HEADERS += include/rtems/score/profiling.h -include_rtems_score_HEADERS += include/rtems/score/processormask.h -include_rtems_score_HEADERS += include/rtems/score/rbtree.h -include_rtems_score_HEADERS += include/rtems/score/rbtreeimpl.h -include_rtems_score_HEADERS += include/rtems/score/scheduler.h -include_rtems_score_HEADERS += include/rtems/score/schedulerimpl.h -include_rtems_score_HEADERS += include/rtems/score/schedulercbs.h -include_rtems_score_HEADERS += include/rtems/score/schedulercbsimpl.h -include_rtems_score_HEADERS += include/rtems/score/scheduleredf.h -include_rtems_score_HEADERS += include/rtems/score/scheduleredfimpl.h -include_rtems_score_HEADERS += include/rtems/score/schedulernode.h -include_rtems_score_HEADERS += include/rtems/score/schedulernodeimpl.h -include_rtems_score_HEADERS += include/rtems/score/schedulerpriority.h -include_rtems_score_HEADERS += include/rtems/score/schedulerpriorityimpl.h -include_rtems_score_HEADERS += include/rtems/score/schedulerprioritysmp.h -include_rtems_score_HEADERS += include/rtems/score/schedulersimple.h -include_rtems_score_HEADERS += include/rtems/score/schedulersimpleimpl.h -include_rtems_score_HEADERS += include/rtems/score/schedulersmp.h -include_rtems_score_HEADERS += include/rtems/score/schedulersmpimpl.h -include_rtems_score_HEADERS += include/rtems/score/semaphoreimpl.h -include_rtems_score_HEADERS += include/rtems/score/smp.h -include_rtems_score_HEADERS += include/rtems/score/smpbarrier.h -include_rtems_score_HEADERS += include/rtems/score/smplock.h -include_rtems_score_HEADERS += include/rtems/score/smplockseq.h -include_rtems_score_HEADERS += include/rtems/score/smpimpl.h -include_rtems_score_HEADERS += include/rtems/score/stack.h -include_rtems_score_HEADERS += include/rtems/score/stackimpl.h -include_rtems_score_HEADERS += include/rtems/score/states.h -include_rtems_score_HEADERS += include/rtems/score/statesimpl.h -include_rtems_score_HEADERS += include/rtems/score/status.h -include_rtems_score_HEADERS += include/rtems/score/sysstate.h -include_rtems_score_HEADERS += include/rtems/score/thread.h -include_rtems_score_HEADERS += include/rtems/score/threadimpl.h -include_rtems_score_HEADERS += include/rtems/score/threaddispatch.h -include_rtems_score_HEADERS += include/rtems/score/threadq.h -include_rtems_score_HEADERS += include/rtems/score/threadqimpl.h -include_rtems_score_HEADERS += include/rtems/score/timespec.h -include_rtems_score_HEADERS += include/rtems/score/timestamp.h -include_rtems_score_HEADERS += include/rtems/score/timecounter.h -include_rtems_score_HEADERS += include/rtems/score/timecounterimpl.h -include_rtems_score_HEADERS += include/rtems/score/tls.h -include_rtems_score_HEADERS += include/rtems/score/tod.h -include_rtems_score_HEADERS += include/rtems/score/todimpl.h -include_rtems_score_HEADERS += include/rtems/score/userext.h -include_rtems_score_HEADERS += include/rtems/score/userextimpl.h -include_rtems_score_HEADERS += include/rtems/score/watchdog.h -include_rtems_score_HEADERS += include/rtems/score/watchdogimpl.h -include_rtems_score_HEADERS += include/rtems/score/wkspace.h -include_rtems_score_HEADERS += include/rtems/score/cpuopts.h -include_rtems_score_HEADERS += include/rtems/score/basedefs.h - if HAS_MP # We only build multiprocessing related files if HAS_MP was defined -include_rtems_score_HEADERS += include/rtems/score/mpci.h -include_rtems_score_HEADERS += include/rtems/score/mpciimpl.h -include_rtems_score_HEADERS += include/rtems/score/mppkt.h -include_rtems_score_HEADERS += include/rtems/score/objectmp.h -include_rtems_score_HEADERS += include/rtems/score/threadmp.h endif if HAS_SMP -include_rtems_score_HEADERS += include/rtems/score/scheduleredfsmp.h -include_rtems_score_HEADERS += include/rtems/score/schedulerprioritysmpimpl.h -include_rtems_score_HEADERS += include/rtems/score/schedulerpriorityaffinitysmp.h -include_rtems_score_HEADERS += include/rtems/score/schedulersimplesmp.h -include_rtems_score_HEADERS += include/rtems/score/schedulerstrongapa.h -include_rtems_score_HEADERS += include/rtems/score/smplockmcs.h -include_rtems_score_HEADERS += include/rtems/score/smplockstats.h -include_rtems_score_HEADERS += include/rtems/score/smplockticket.h endif ## src @@ -354,6 +233,5 @@ EXTRA_DIST = src/Unlimited.txt DISTCLEANFILES = include/rtems/score/cpuopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am index a0881e80e9..9de025d7fd 100644 --- a/cpukit/score/cpu/arm/Makefile.am +++ b/cpukit/score/cpu/arm/Makefile.am @@ -1,20 +1,4 @@ include $(top_srcdir)/automake/compile.am -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/cpu_asm.h -include_rtems_score_HEADERS += rtems/score/arm.h -include_rtems_score_HEADERS += rtems/score/armv4.h -include_rtems_score_HEADERS += rtems/score/armv7m.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - -include_libcpudir = $(includedir)/libcpu -include_libcpu_HEADERS = include/libcpu/arm-cp15.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) libscorecpu_a_SOURCES = @@ -48,5 +32,4 @@ libscorecpu_a_SOURCES += armv7m-isr-level-set.c libscorecpu_a_SOURCES += armv7m-isr-vector-install.c libscorecpu_a_SOURCES += armv7m-multitasking-start-stop.c -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/bfin/Makefile.am b/cpukit/score/cpu/bfin/Makefile.am index 8fa75df995..016fff9aa2 100644 --- a/cpukit/score/cpu/bfin/Makefile.am +++ b/cpukit/score/cpu/bfin/Makefile.am @@ -1,26 +1,9 @@ include $(top_srcdir)/automake/compile.am -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/asm.h - -include_rtems_bfindir = $(includedir)/rtems/bfin -include_rtems_bfin_HEADERS = rtems/bfin/bfin.h -include_rtems_bfin_HEADERS += rtems/bfin/bf533.h -include_rtems_bfin_HEADERS += rtems/bfin/bf52x.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/bfin.h -include_rtems_score_HEADERS += rtems/score/cpu_asm.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.S libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += bfin-exception-frame-print.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/epiphany/Makefile.am b/cpukit/score/cpu/epiphany/Makefile.am index ed99b436e6..e8e23038cb 100644 --- a/cpukit/score/cpu/epiphany/Makefile.am +++ b/cpukit/score/cpu/epiphany/Makefile.am @@ -3,21 +3,6 @@ include $(top_srcdir)/automake/compile.am CLEANFILES = DISTCLEANFILES = -include_rtemsdir = $(includedir)/rtems - -include_rtems_HEADERS = rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score - -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h -include_rtems_score_HEADERS += rtems/score/cpu_asm.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/epiphany.h -include_rtems_score_HEADERS += rtems/score/epiphany-utility.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c @@ -29,5 +14,4 @@ libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) all-local: $(PREINSTALL_FILES) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/i386/Makefile.am b/cpukit/score/cpu/i386/Makefile.am index 7fb2a081b6..55bbb67b20 100644 --- a/cpukit/score/cpu/i386/Makefile.am +++ b/cpukit/score/cpu/i386/Makefile.am @@ -1,22 +1,8 @@ include $(top_srcdir)/automake/compile.am -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS= rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/i386.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/interrupts.h -include_rtems_score_HEADERS += rtems/score/registers.h -include_rtems_score_HEADERS += rtems/score/idtr.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.S libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/lm32/Makefile.am b/cpukit/score/cpu/lm32/Makefile.am index 72cb69abcc..fa2fc398fc 100644 --- a/cpukit/score/cpu/lm32/Makefile.am +++ b/cpukit/score/cpu/lm32/Makefile.am @@ -1,21 +1,9 @@ include $(top_srcdir)/automake/compile.am -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/lm32.h -include_rtems_score_HEADERS += rtems/score/cpu_asm.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.S irq.c libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += lm32-exception-frame-print.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/m32c/Makefile.am b/cpukit/score/cpu/m32c/Makefile.am index 993cf4b4d3..389f554849 100644 --- a/cpukit/score/cpu/m32c/Makefile.am +++ b/cpukit/score/cpu/m32c/Makefile.am @@ -1,18 +1,5 @@ include $(top_srcdir)/automake/compile.am -include_HEADERS = varvects.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/m32c.h -include_rtems_score_HEADERS += rtems/score/cpu_asm.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.c context_switch.S context_init.c \ varvects.S @@ -20,5 +7,4 @@ libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += m32c-exception-frame-print.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am index 04eebcba85..445e4c536c 100644 --- a/cpukit/score/cpu/m68k/Makefile.am +++ b/cpukit/score/cpu/m68k/Makefile.am @@ -3,26 +3,9 @@ include $(top_srcdir)/automake/compile.am noinst_LIBRARIES = libscorecpu.a libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/asm.h - -include_rtems_m68kdir = $(includedir)/rtems/m68k -include_rtems_m68k_HEADERS = rtems/m68k/m68302.h -include_rtems_m68k_HEADERS += rtems/m68k/m68360.h -include_rtems_m68k_HEADERS += rtems/m68k/qsm.h -include_rtems_m68k_HEADERS += rtems/m68k/sim.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/m68k.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - libscorecpu_a_SOURCES = cpu.c cpu_asm.S libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += m68k-exception-frame-print.c libscorecpu_a_SOURCES += __m68k_read_tp.c -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am index 123e5232b9..55bbb67b20 100644 --- a/cpukit/score/cpu/mips/Makefile.am +++ b/cpukit/score/cpu/mips/Makefile.am @@ -1,23 +1,8 @@ include $(top_srcdir)/automake/compile.am -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/asm.h - -include_rtems_mipsdir = $(includedir)/rtems/mips -include_rtems_mips_HEADERS = rtems/mips/idtcpu.h -include_rtems_mips_HEADERS += rtems/mips/iregdef.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/mips.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.S libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/moxie/Makefile.am b/cpukit/score/cpu/moxie/Makefile.am index edd2bd4699..98b49a8feb 100644 --- a/cpukit/score/cpu/moxie/Makefile.am +++ b/cpukit/score/cpu/moxie/Makefile.am @@ -4,19 +4,9 @@ include $(top_srcdir)/automake/compile.am -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/moxie.h \ - rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c moxie-exception-frame-print.c cpu_asm.S libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/nios2/Makefile.am b/cpukit/score/cpu/nios2/Makefile.am index b3e9d28c01..f0920bf6e4 100644 --- a/cpukit/score/cpu/nios2/Makefile.am +++ b/cpukit/score/cpu/nios2/Makefile.am @@ -3,22 +3,6 @@ include $(top_srcdir)/automake/compile.am CLEANFILES = DISTCLEANFILES = -include_rtemsdir = $(includedir)/rtems - -include_rtems_HEADERS = rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score - -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/nios2.h -include_rtems_score_HEADERS += rtems/score/nios2-utility.h -include_rtems_score_HEADERS += rtems/score/nios2-count-zeros.h -include_rtems_score_HEADERS += rtems/score/cpu_asm.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = @@ -50,6 +34,5 @@ libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) all-local: $(PREINSTALL_FILES) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/no_cpu/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am index 3134c01da8..ec6624a969 100644 --- a/cpukit/score/cpu/no_cpu/Makefile.am +++ b/cpukit/score/cpu/no_cpu/Makefile.am @@ -1,19 +1,8 @@ include $(top_srcdir)/automake/compile.am -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/no_cpu.h -include_rtems_score_HEADERS += rtems/score/cpu_asm.h -include_rtems_score_HEADERS += rtems/score/types.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.c libscorecpu_a_SOURCES += cpucounterread.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/or1k/Makefile.am b/cpukit/score/cpu/or1k/Makefile.am index c9f28595f8..bcc4d8be34 100644 --- a/cpukit/score/cpu/or1k/Makefile.am +++ b/cpukit/score/cpu/or1k/Makefile.am @@ -3,21 +3,6 @@ include $(top_srcdir)/automake/compile.am CLEANFILES = DISTCLEANFILES = -include_rtemsdir = $(includedir)/rtems - -include_rtems_HEADERS = rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score - -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h -include_rtems_score_HEADERS += rtems/score/cpu_asm.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/or1k.h -include_rtems_score_HEADERS += rtems/score/or1k-utility.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = @@ -34,5 +19,4 @@ libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) all-local: $(PREINSTALL_FILES) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am index 7ed1f7996f..a895c8651c 100644 --- a/cpukit/score/cpu/powerpc/Makefile.am +++ b/cpukit/score/cpu/powerpc/Makefile.am @@ -1,18 +1,5 @@ include $(top_srcdir)/automake/compile.am -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/powerpc.h -include_rtems_score_HEADERS += rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - -include_rtems_powerpcdir = $(includedir)/rtems/powerpc -include_rtems_powerpc_HEADERS = rtems/powerpc/registers.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c libscorecpu_a_SOURCES += ppc-context-volatile-clobber.S @@ -21,5 +8,4 @@ libscorecpu_a_SOURCES += ppc-isr-disable-mask.S libscorecpu_a_SOURCES += ppc-isr-vector-install.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/riscv/Makefile.am b/cpukit/score/cpu/riscv/Makefile.am index 1de5b2da42..b1c52cef71 100644 --- a/cpukit/score/cpu/riscv/Makefile.am +++ b/cpukit/score/cpu/riscv/Makefile.am @@ -1,16 +1,4 @@ include $(top_srcdir)/automake/compile.am -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/cpu_asm.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/riscv.h -include_rtems_score_HEADERS += rtems/score/riscv-utility.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) libscorecpu_a_SOURCES = cpu.c @@ -22,5 +10,4 @@ libscorecpu_a_SOURCES += riscv-context-initialize.c libscorecpu_a_SOURCES += riscv-context-validate.S libscorecpu_a_SOURCES += riscv-context-volatile-clobber.S -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/sh/Makefile.am b/cpukit/score/cpu/sh/Makefile.am index b480b1aa26..23274f9e55 100644 --- a/cpukit/score/cpu/sh/Makefile.am +++ b/cpukit/score/cpu/sh/Makefile.am @@ -1,21 +1,9 @@ include $(top_srcdir)/automake/compile.am -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/sh.h -include_rtems_score_HEADERS += rtems/score/sh_io.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c context.c libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += sh-exception-frame-print.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am index e03aabc0ff..bc37c94aaa 100644 --- a/cpukit/score/cpu/sparc/Makefile.am +++ b/cpukit/score/cpu/sparc/Makefile.am @@ -1,19 +1,5 @@ include $(top_srcdir)/automake/compile.am -include_libcpudir = $(includedir)/libcpu -include_libcpu_HEADERS = include/libcpu/byteorder.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/sparc.h -include_rtems_score_HEADERS += rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/sparcimpl.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c libscorecpu_a_SOURCES += sparc-context-volatile-clobber.S @@ -22,5 +8,4 @@ libscorecpu_a_SOURCES += sparc-counter.c libscorecpu_a_SOURCES += sparc-counter-asm.S libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/sparc64/Makefile.am b/cpukit/score/cpu/sparc64/Makefile.am index 491c197b81..bb78cb22de 100644 --- a/cpukit/score/cpu/sparc64/Makefile.am +++ b/cpukit/score/cpu/sparc64/Makefile.am @@ -1,23 +1,12 @@ include $(top_srcdir)/automake/compile.am -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/asm.h - #include_rtems_sparc64dir = $(includedir)/rtems/sparc64 #include_rtems_sparc64_HEADERS = -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/sparc64.h -include_rtems_score_HEADERS += rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = context.S cpu.c libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += sparc64-exception-frame-print.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/v850/Makefile.am b/cpukit/score/cpu/v850/Makefile.am index 7200f2a097..4eda160002 100644 --- a/cpukit/score/cpu/v850/Makefile.am +++ b/cpukit/score/cpu/v850/Makefile.am @@ -1,15 +1,5 @@ include $(top_srcdir)/automake/compile.am -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/v850.h -include_rtems_score_HEADERS += rtems/score/cpu_asm.h rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c libscorecpu_a_SOURCES += cpu_asm.S @@ -17,5 +7,4 @@ libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += v850-exception-frame-print.c libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/telnetd/Makefile.am b/cpukit/telnetd/Makefile.am index d114ba4a3b..e2ae6a92ae 100644 --- a/cpukit/telnetd/Makefile.am +++ b/cpukit/telnetd/Makefile.am @@ -2,10 +2,12 @@ include $(top_srcdir)/automake/compile.am if LIBNETWORKING if LIBSHELL -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = pty.h telnetd.h passwd.h - project_lib_LIBRARIES = libtelnetd.a + +$(PROJECT_LIB)/libtelnetd.a: libtelnetd.a + $(INSTALL_DATA) $< $(PROJECT_LIB)/libtelnetd.a +TMPINSTALL_FILES = $(PROJECT_LIB)/libtelnetd.a + libtelnetd_a_SOURCES = check_passwd.c des.c pty.c telnetd.c libtelnetd_a_CPPFLAGS = $(AM_CPPFLAGS) endif @@ -13,5 +15,4 @@ endif EXTRA_DIST = README -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index 14f0c33a06..2fdb754b4b 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -5,6 +5,11 @@ include $(top_srcdir)/automake/compile.am ARCH = o-optimize project_lib_LIBRARIES = librtemscpu.a + +$(PROJECT_LIB)/librtemscpu.a: librtemscpu.a + $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemscpu.a +TMPINSTALL_FILES = $(PROJECT_LIB)/librtemscpu.a + librtemscpu_a_SOURCES = TMP_LIBS = @@ -134,5 +139,4 @@ librtemscpu.a: $(TMP_LIBS) all-local: $(TMPINSTALL_FILES) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/zlib/Makefile.am b/cpukit/zlib/Makefile.am index 0b38ecd5c2..f5a42cccb6 100644 --- a/cpukit/zlib/Makefile.am +++ b/cpukit/zlib/Makefile.am @@ -2,6 +2,11 @@ include $(top_srcdir)/automake/compile.am project_lib_LIBRARIES = libz.a +$(PROJECT_LIB)/libz.a: libz.a + $(INSTALL_DATA) $< $(PROJECT_LIB)/libz.a +TMPINSTALL_FILES = $(PROJECT_LIB)/libz.a + + libz_a_SOURCES = adler32.c libz_a_SOURCES += compress.c libz_a_SOURCES += crc32.c crc32.h @@ -18,7 +23,4 @@ libz_a_SOURCES += zconf.h libz_a_SOURCES += zlib.h libz_a_SOURCES += zutil.c zutil.h -include_HEADERS = zlib.h - -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/testsuites/aclocal/prog-cc.m4 b/testsuites/aclocal/prog-cc.m4 index c57008b1e9..2076529f9d 100644 --- a/testsuites/aclocal/prog-cc.m4 +++ b/testsuites/aclocal/prog-cc.m4 @@ -25,10 +25,11 @@ dnl check target cc RTEMS_PROG_CC AS_IF([test x"$GCC" = xyes],[ -AS_IF([test "${enable_cpukit_root+set}"],[ - GCCSPECS="-B\$(CPUKIT_ROOT)/lib/"]) -AS_IF([test "${enable_project_root+set}"],[ - GCCSPECS="$GCCSPECS -B\$(PROJECT_ROOT)/lib/"]) +GCCSPECS="-B\$(RTEMS_SOURCE_ROOT)/c/src/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/" GCCSPECS="${GCCSPECS} -specs bsp_specs -qrtems"]) AC_SUBST(GCCSPECS) + +RTEMS_INCLUDES +RTEMS_BSP_INCLUDES +RTEMS_BSP_LINKCMDS ]) diff --git a/testsuites/aclocal/rtems-bsp-includes.m4 b/testsuites/aclocal/rtems-bsp-includes.m4 new file mode 100644 index 0000000000..394d50acd4 --- /dev/null +++ b/testsuites/aclocal/rtems-bsp-includes.m4 @@ -0,0 +1,23 @@ +dnl +dnl RTEMS Include paths. +dnl +AC_DEFUN([RTEMS_BSP_INCLUDES], +[ +AC_REQUIRE([RTEMS_SOURCE_TOP]) +AC_REQUIRE([RTEMS_BUILD_TOP]) + +RTEMS_BSP_INCLUDE_BSP="-I${RTEMS_SOURCE_ROOT}/bsps/include" +RTEMS_BSP_INCLUDE_BSP_ARCH="-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/include" +RTEMS_BSP_INCLUDE_BSP_ARCH_BSP="-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP)/include" +RTEMS_BSP_INCLUDE_BSP_FAMILY="-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include" +RTEMS_BSP_ARCH_INCLUDE="${RTEMS_BSP_INCLUDE_BSP} ${RTEMS_BSP_INCLUDE_BSP_ARCH}" +RTEMS_BSP_ARCH_INCLUDE="${RTEMS_BSP_ARCH_INCLUDE} ${RTEMS_BSP_INCLUDE_BSP_ARCH_BSP} ${RTEMS_BSP_INCLUDE_BSP_FAMILY}" + +RTEMS_BSP_BUILD_INCLUDE="-I${RTEMS_BUILD_ROOT}/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include" + +RTEMS_BSP_INCLUDE="${RTEMS_BSP_BUILD_INCLUDE} ${RTEMS_BSP_ARCH_INCLUDE}" + +RTEMS_BSP_CPPFLAGS="${RTEMS_BSP_INCLUDE}" + +AC_SUBST([RTEMS_BSP_CPPFLAGS]) +]) diff --git a/testsuites/aclocal/rtems-bsp-linkcmds.m4 b/testsuites/aclocal/rtems-bsp-linkcmds.m4 new file mode 100644 index 0000000000..d84d270c5c --- /dev/null +++ b/testsuites/aclocal/rtems-bsp-linkcmds.m4 @@ -0,0 +1,31 @@ +dnl +dnl RTEMS Include paths. +dnl +AC_DEFUN([RTEMS_BSP_LINKCMDS], +[ +AC_REQUIRE([RTEMS_SOURCE_TOP]) +AC_REQUIRE([RTEMS_BUILD_TOP]) + +RTEMS_BSP_ARCH_PATH="${RTEMS_SOURCE_ROOT}/c/src/lib/libbsp/${RTEMS_CPU}" +RTEMS_BSP_ARCH_LINKCMDS_PATH="${RTEMS_BSP_ARCH_PATH}/shared/startup" +AC_SUBST(RTEMS_BSP_ARCH_LINKCMDS_PATH) + +RTEMS_BSP_LINKCMDS_PATH="${RTEMS_BSP_ARCH_PATH}/${RTEMS_BSP_FAMILY}/startup" +AC_SUBST(RTEMS_BSP_LINKCMDS_PATH) + +RTEMS_BSP_LINKCMDS_SCRIPT= +for f in "linkcmds.${RTEMS_BSP}" "linkcmds.${RTEMS_BSP_FAMILY}" "linkcmds"; +do + AS_IF([test -f "${RTEMS_BSP_LINKCMDS_PATH}/$f"],[ + RTEMS_BSP_LINKCMDS_SCRIPT="$f" + break]) +done + +AS_IF([test -z "${RTEMS_BSP_LINKCMDS_SCRIPT}"],[ + AC_MSG_ERROR([can not determine linkcmds])]) + +RTEMS_BSP_LIBBSP_PATH="${RTEMS_BUILD_ROOT}/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}" +AC_SUBST(RTEMS_BSP_LIBBSP_PATH) + +AC_SUBST(RTEMS_BSP_LINKCMDS_SCRIPT) +]) diff --git a/testsuites/aclocal/rtems-build-top.m4 b/testsuites/aclocal/rtems-build-top.m4 new file mode 100644 index 0000000000..5708119c14 --- /dev/null +++ b/testsuites/aclocal/rtems-build-top.m4 @@ -0,0 +1,12 @@ +dnl +dnl RTEMS_BUILD_TOP($1) +dnl +AC_DEFUN([RTEMS_BUILD_TOP], +[dnl +# +# This is a copy of the horrible hack in rtems-top.m4 and it is simpler to +# copy it that attempt to clean this crap up. +# +RTEMS_BUILD_ROOT="${with_rtems_build_top}" +AC_SUBST([RTEMS_BUILD_ROOT]) +])dnl diff --git a/testsuites/aclocal/rtems-includes.m4 b/testsuites/aclocal/rtems-includes.m4 new file mode 100644 index 0000000000..ca4ebed581 --- /dev/null +++ b/testsuites/aclocal/rtems-includes.m4 @@ -0,0 +1,23 @@ +dnl +dnl RTEMS Include paths. +dnl +AC_DEFUN([RTEMS_INCLUDES], +[ +AC_REQUIRE([RTEMS_SOURCE_TOP]) +AC_REQUIRE([RTEMS_BUILD_TOP]) + +# Was CFLAGS set? +rtems_cv_CFLAGS_set="${CFLAGS+set}" + +RTEMS_INCLUDE_CPUKIT="-I${RTEMS_SOURCE_ROOT}/cpukit/include" +RTEMS_INCLUDE_CPUKIT_ARCH="-I${RTEMS_SOURCE_ROOT}/cpukit/score/cpu/\$(RTEMS_CPU)/include" + +RTEMS_CPUKIT_INCLUDE="${RTEMS_INCLUDE_CPUKIT} ${RTEMS_INCLUDE_CPUKIT_ARCH}" +RTEMS_BUILD_INCLUDE="-I\$(top_builddir) -I${RTEMS_BUILD_ROOT}/include" + +RTEMS_INCLUDE="${RTEMS_BUILD_INCLUDE} ${RTEMS_CPUKIT_INCLUDE}" + +RTEMS_CPPFLAGS="${RTEMS_INCLUDE}" + +AC_SUBST([RTEMS_CPPFLAGS]) +]) diff --git a/testsuites/aclocal/rtems-source-top.m4 b/testsuites/aclocal/rtems-source-top.m4 new file mode 100644 index 0000000000..d1460ae82d --- /dev/null +++ b/testsuites/aclocal/rtems-source-top.m4 @@ -0,0 +1,8 @@ +dnl +dnl RTEMS_SOURCE_TOP +dnl +AC_DEFUN([RTEMS_SOURCE_TOP], +[dnl +RTEMS_SOURCE_ROOT="${with_rtems_source_top}" +AC_SUBST([RTEMS_SOURCE_ROOT]) +])dnl diff --git a/testsuites/ada/configure.ac b/testsuites/ada/configure.ac index a9293842b9..4ec8532ada 100644 --- a/testsuites/ada/configure.ac +++ b/testsuites/ada/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-ada-tests],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([support]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/automake/compile.am b/testsuites/automake/compile.am index ee1f77381a..738cefe549 100644 --- a/testsuites/automake/compile.am +++ b/testsuites/automake/compile.am @@ -1,6 +1,6 @@ -CC = @CC@ $(GCCSPECS) -CXX = @CXX@ $(GCCSPECS) -CPP = @CPP@ $(GCCSPECS) +CC = @CC@ +CXX = @CXX@ +CPP = @CPP@ LD = @LD@ OBJCOPY = @OBJCOPY@ @@ -9,9 +9,13 @@ SIZE = @SIZE@ STRIP = @STRIP@ ## -AM_CPPFLAGS = $(TEST_FLAGS) +AM_CPPFLAGS = $(TEST_FLAGS) @RTEMS_CPPFLAGS@ @RTEMS_BSP_CPPFLAGS@ AM_CFLAGS = $(TEST_C_FLAGS) AM_CXXFLAGS = $(TEST_CXX_FLAGS) -AM_LDFLAGS = $(TEST_LD_FLAGS) +AM_LDFLAGS = -B$(RTEMS_BSP_LIBBSP_PATH) $(GCCSPECS) -qnolinkcmds \ + -L$(PROJECT_LIB) \ + -L$(RTEMS_BSP_ARCH_LINKCMDS_PATH) \ + -Wl,-T$(RTEMS_BSP_LINKCMDS_PATH)/$(RTEMS_BSP_LINKCMDS_SCRIPT) \ + $(TEST_LD_FLAGS) CLEANFILES = *.num *.nxe *.elf *.srec* *.bin *.bt *.ralf diff --git a/testsuites/automake/host.am b/testsuites/automake/host.am index c25c0526a4..2f0beadd89 100644 --- a/testsuites/automake/host.am +++ b/testsuites/automake/host.am @@ -3,6 +3,3 @@ ## Once automake is fully integrated these make targets ## and this file will probably be removed -preinstall-am: $(PREINSTALL_FILES) -preinstall: preinstall-am -.PHONY: preinstall preinstall-am diff --git a/testsuites/automake/local.am b/testsuites/automake/local.am index 31299028d6..b87fd89810 100644 --- a/testsuites/automake/local.am +++ b/testsuites/automake/local.am @@ -1,6 +1,5 @@ -preinstall: -.PHONY: preinstall - PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools TEST_LD_FLAGS = -Wl,--wrap=printf -Wl,--wrap=puts -Wl,--wrap=putchar + +all-local: $(TMPINSTALL_FILES) diff --git a/testsuites/benchmarks/configure.ac b/testsuites/benchmarks/configure.ac index f28fc79162..a9dbefccc8 100644 --- a/testsuites/benchmarks/configure.ac +++ b/testsuites/benchmarks/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-tests-benchmarks],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/configure.ac b/testsuites/configure.ac index ae01a97079..a01bc43130 100644 --- a/testsuites/configure.ac +++ b/testsuites/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-tests],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([PROBLEMS]) RTEMS_TOP([..],[]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/fstests/configure.ac b/testsuites/fstests/configure.ac index 37a92bbca5..9b4a299e80 100644 --- a/testsuites/fstests/configure.ac +++ b/testsuites/fstests/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-fstests], [_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([imfs_support]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/libtests/POSIX/Makefile.am b/testsuites/libtests/POSIX/Makefile.am index 1f806513cf..689fd391e6 100644 --- a/testsuites/libtests/POSIX/Makefile.am +++ b/testsuites/libtests/POSIX/Makefile.am @@ -1,4 +1,4 @@ -CC = @CC@ $(GCCSPECS) +CC = @CC@ check_PROGRAMS = diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac index 16cc095991..dc4602cbb2 100644 --- a/testsuites/libtests/configure.ac +++ b/testsuites/libtests/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-libtests],[_RTEMS_VERSION],[https://devel.rtems.org/n AC_CONFIG_SRCDIR([cpuuse]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/mptests/configure.ac b/testsuites/mptests/configure.ac index f01cfc1c94..fca89117a1 100644 --- a/testsuites/mptests/configure.ac +++ b/testsuites/mptests/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-mptests],[_RTEMS_VERSION],[https://devel.rtems.org/ne AC_CONFIG_SRCDIR([mp01]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/psxtests/configure.ac b/testsuites/psxtests/configure.ac index 7243bfdbb5..e84d92c0cc 100644 --- a/testsuites/psxtests/configure.ac +++ b/testsuites/psxtests/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-psxtests],[_RTEMS_VERSION],[https://devel.rtems.org/n AC_CONFIG_SRCDIR([psx01]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac index b3ab540951..becaa2e03a 100644 --- a/testsuites/psxtmtests/configure.ac +++ b/testsuites/psxtmtests/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-tests-psxtmtests],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([psxtmmutex02]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/rhealstone/configure.ac b/testsuites/rhealstone/configure.ac index af35f6819d..9319c28a5c 100644 --- a/testsuites/rhealstone/configure.ac +++ b/testsuites/rhealstone/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-rhealstone],[_RTEMS_VERSION],[https://devel.rtems.org AC_CONFIG_SRCDIR([rhtaskswitch]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/samples/configure.ac b/testsuites/samples/configure.ac index ffe1bad2c2..88e868feaf 100644 --- a/testsuites/samples/configure.ac +++ b/testsuites/samples/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-samples],[_RTEMS_VERSION],[https://devel.rtems.org/ne AC_CONFIG_SRCDIR([hello]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/smptests/configure.ac b/testsuites/smptests/configure.ac index d72f6e072d..78996b23ab 100644 --- a/testsuites/smptests/configure.ac +++ b/testsuites/smptests/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-smptests],[_RTEMS_VERSION],[https://devel.rtems.org/n AC_CONFIG_SRCDIR([smp01]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index 6a303b25c5..2dcdb0cfa2 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-sptests],[_RTEMS_VERSION],[https://devel.rtems.org/ne AC_CONFIG_SRCDIR([sp01]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/tmtests/configure.ac b/testsuites/tmtests/configure.ac index b899000a3e..a5d8c3e182 100644 --- a/testsuites/tmtests/configure.ac +++ b/testsuites/tmtests/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-tmtests],[_RTEMS_VERSION],[https://devel.rtems.org/ne AC_CONFIG_SRCDIR([tm01]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/tools/configure.ac b/testsuites/tools/configure.ac index 4249701488..5f559b80c9 100644 --- a/testsuites/tools/configure.ac +++ b/testsuites/tools/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-tests-tools],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([generic]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/tools/generic/configure.ac b/testsuites/tools/generic/configure.ac index 73f1144e50..ffde158897 100644 --- a/testsuites/tools/generic/configure.ac +++ b/testsuites/tools/generic/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-tests-tools-generic],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([sorttimes.in]) RTEMS_TOP(../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/tools/build/configure.ac b/tools/build/configure.ac index d1e22da235..10a61ed63d 100644 --- a/tools/build/configure.ac +++ b/tools/build/configure.ac @@ -2,6 +2,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-tools-build],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([install-if-change.in]) RTEMS_TOP(../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP AC_CANONICAL_HOST diff --git a/tools/cpu/configure.ac b/tools/cpu/configure.ac index 70d74b6329..58081121ce 100644 --- a/tools/cpu/configure.ac +++ b/tools/cpu/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-tools-cpu],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([generic]) RTEMS_TOP(../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/tools/cpu/generic/configure.ac b/tools/cpu/generic/configure.ac index e169be9a0e..c393d309a6 100644 --- a/tools/cpu/generic/configure.ac +++ b/tools/cpu/generic/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-tools-cpu-generic],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([size_rtems.in]) RTEMS_TOP(../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/tools/cpu/nios2/configure.ac b/tools/cpu/nios2/configure.ac index fe39a2cbb5..208819128a 100644 --- a/tools/cpu/nios2/configure.ac +++ b/tools/cpu/nios2/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-tools-cpu-nios2],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([nios2gen.c]) RTEMS_TOP(../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/tools/cpu/sh/configure.ac b/tools/cpu/sh/configure.ac index ddbb46630f..7b6b1187b7 100644 --- a/tools/cpu/sh/configure.ac +++ b/tools/cpu/sh/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-tools-cpu-sh],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([shgen.c]) RTEMS_TOP(../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU |