From d1b210cd17037565daf172975aff68cdadbb9944 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 29 Sep 2003 10:39:05 +0000 Subject: 2003-09-29 Ralf Corsepius * Makefile.am: Merge-in include/Makefile.am. Reflect changes to bsp.am. * include/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/c4x/c4xsim/ChangeLog | 11 +++++++++++ c/src/lib/libbsp/c4x/c4xsim/Makefile.am | 19 ++++++++++++++++--- c/src/lib/libbsp/c4x/c4xsim/bsp_specs | 8 -------- c/src/lib/libbsp/c4x/c4xsim/configure.ac | 1 - c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am | 23 ----------------------- 5 files changed, 27 insertions(+), 35 deletions(-) delete mode 100644 c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am (limited to 'c/src/lib/libbsp/c4x') diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog index 96191f172e..1c016f0438 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog +++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog @@ -1,3 +1,14 @@ +2003-09-29 Ralf Corsepius + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + +2003-09-17 Ralf Corsepius + + * bsp_specs: Remove *lib:. + 2003-09-04 Joel Sherrill * clock/clock.c, console/console.c, console/consolereserveresources.c, diff --git a/c/src/lib/libbsp/c4x/c4xsim/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am index f77ab70c74..3484731e2c 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/Makefile.am +++ b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am @@ -5,12 +5,25 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal # wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = . start include startup console clock timer wrapup tools +# from the individual .rel files built in other directories +SUBDIRS = . start startup console clock timer wrapup tools include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +include_HEADERS += include/simio.h +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(PROJECT_INCLUDE)/simio.h: include/simio.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/simio.h + +$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/c4x/c4xsim/bsp_specs b/c/src/lib/libbsp/c4x/c4xsim/bsp_specs index 807fba5c70..de8ff74885 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/bsp_specs +++ b/c/src/lib/libbsp/c4x/c4xsim/bsp_specs @@ -1,15 +1,7 @@ -%rename lib old_lib %rename endfile old_endfile %rename startfile old_startfile %rename link old_link - -*lib: -%{!qrtems: %(old_lib)} %{!nostdlib: %{qrtems: --start-group \ -%{!qrtems_debug: -lrtemsbsp -lrtemscpu} %{qrtems_debug: -lrtemsbsp_g -lrtemscpu_g} \ --lc -lgcc --end-group \ -%{!qnolinkcmds: -T linkcmds%s}}} - *startfile: %{!qrtems: %(old_startfile)} %{!nostdlib: %{qrtems: \ %{!qrtems_debug: start.o%s} \ diff --git a/c/src/lib/libbsp/c4x/c4xsim/configure.ac b/c/src/lib/libbsp/c4x/c4xsim/configure.ac index 81a27897f7..902f2f9e12 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/configure.ac +++ b/c/src/lib/libbsp/c4x/c4xsim/configure.ac @@ -20,7 +20,6 @@ RTEMS_CONFIG_BUILD_SUBDIRS(tools) AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile start/Makefile startup/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am deleted file mode 100644 index 211d42d09c..0000000000 --- a/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h simio.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - cp $< $@ -CLEANFILES = coverhd.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3