diff options
Diffstat (limited to 'c/src')
749 files changed, 18461 insertions, 14691 deletions
diff --git a/c/src/Makefile.in b/c/src/Makefile.in index f3fd6f2ea8..028423299f 100644 --- a/c/src/Makefile.in +++ b/c/src/Makefile.in @@ -1,25 +1,426 @@ +# Makefile.in generated automatically by automake 1.4 from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + # # $Id$ # -@SET_MAKE@ + + + +SHELL = @SHELL@ + srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = c/src +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +DESTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = . + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_alias = @build_alias@ +build_triplet = @build@ +host_alias = @host_alias@ +host_triplet = @host@ +target_alias = @target_alias@ +target_triplet = @target@ +INSTALL_CHANGE = @INSTALL_CHANGE@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +PACKAGE = @PACKAGE@ +PACKHEX = @PACKHEX@ PROJECT_ROOT = @PROJECT_ROOT@ +RTEMS_BSP = @RTEMS_BSP@ +RTEMS_CPU = @RTEMS_CPU@ +RTEMS_HOST = @RTEMS_HOST@ +RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_TOPdir = @RTEMS_TOPdir@ +VERSION = @VERSION@ -VPATH = @srcdir@ +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal + +SUBDIRS = make exec lib tests + +rtems_bspdir = $(prefix)/@RTEMS_BSP@ +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs +CONFIG_CLEAN_FILES = +DIST_COMMON = README Makefile.am Makefile.in aclocal.m4 configure \ +configure.in -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg -include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=exec lib tests +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +TAR = tar +GZIP_ENV = --best +all: all-redirect +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../automake/subdirs.am $(top_srcdir)/../../automake/local.am + cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + +config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) + cd $(srcdir) && $(AUTOCONF) + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. + +@SET_MAKE@ + +all-recursive install-data-recursive install-exec-recursive \ +installdirs-recursive install-recursive uninstall-recursive \ +check-recursive installcheck-recursive info-recursive dvi-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) \ + || 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" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ + done; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + -rm -rf $(distdir) + GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz + mkdir $(distdir)/=build + mkdir $(distdir)/=inst + dc_install_base=`cd $(distdir)/=inst && pwd`; \ + cd $(distdir)/=build \ + && ../configure --srcdir=.. --prefix=$$dc_install_base \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) dist + -rm -rf $(distdir) + @banner="$(distdir).tar.gz is ready for distribution"; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes" +dist: distdir + -chmod -R a+r $(distdir) + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) + -rm -rf $(distdir) +dist-all: distdir + -chmod -R a+r $(distdir) + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) + -rm -rf $(distdir) +distdir: $(DISTFILES) + -rm -rf $(distdir) + mkdir $(distdir) + -chmod 777 $(distdir) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + for subdir in $(SUBDIRS); do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ + done +info-am: +info: info-recursive +dvi-am: +dvi: dvi-recursive +check-am: all-am +check: check-recursive +installcheck-am: +installcheck: installcheck-recursive +install-exec-am: +install-exec: install-exec-recursive + +install-data-am: install-data-local +install-data: install-data-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-recursive +uninstall-am: +uninstall: uninstall-recursive +all-am: Makefile +all-redirect: all-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: installdirs-recursive +installdirs-am: + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-tags mostlyclean-generic + +mostlyclean: mostlyclean-recursive + +clean-am: clean-tags clean-generic mostlyclean-am + +clean: clean-recursive + +distclean-am: distclean-tags distclean-generic clean-am + +distclean: distclean-recursive + -rm -f config.status + +maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-recursive + -rm -f config.status + +.PHONY: install-data-recursive uninstall-data-recursive \ +install-exec-recursive uninstall-exec-recursive installdirs-recursive \ +uninstalldirs-recursive all-recursive check-recursive \ +installcheck-recursive info-recursive dvi-recursive \ +mostlyclean-recursive distclean-recursive clean-recursive \ +maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-local install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs-am \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# NOTE: The wildcard on the install should pick up everything except +# the tests directory. This significantly minimizes the install size. +install-data-local: + rm -rf $(rtems_bspdir)/[bsl]*; + $(mkinstalldirs) $(rtems_bspdir) + cd $(PROJECT_ROOT); \ + tar cf - @RTEMS_BSP@/[bilsuM]* | (cd $(prefix); tar xpBf - ); + +depend-recursive \ +clobber-recursive \ +preinstall-recursive \ +debug-recursive \ +debug_install-recursive \ +profile-recursive \ +profile_install-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) \ + || 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" + +debug: debug-recursive +.PHONY: debug-recursive + +debug_install: debug_install-recursive +.PHONY: debug_install-recursive + +profile: profile-recursive +.PHONY: profile-recursive + +profile_install: profile_install-recursive +.PHONY: profile-recursive + +preinstall: preinstall-recursive +.PHONY: preinstall-recursive + +clobber: clobber-recursive +.PHONY: clobber-recursive + +depend: depend-recursive +.PHONY: depend-recursive + +debug-am: +debug: debug-am +.PHONY: debug debug-am + +debug_install-am: +debug_install: debug_install-am +.PHONY: debug_install debug_install-am + +profile-am: +profile: profile-am +.PHONY: profile profile-am + +profile_install-am: +profile_install: profile_install-am +.PHONY: profile_install profile_install-am + +preinstall-am: +preinstall: preinstall-am +.PHONY: preinstall preinstall-am + +clobber-am: +clobber: clobber-am +.PHONY: clobber clobber-am + +depend-am: +depend: depend-am +.PHONY: depend depend-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/c/src/exec/Makefile.in b/c/src/exec/Makefile.in index 83365a0d87..063f4306d3 100644 --- a/c/src/exec/Makefile.in +++ b/c/src/exec/Makefile.in @@ -5,24 +5,23 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = c/src/exec +top_builddir = . -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -POSIX_DIRS_yes_V=posix +INSTALL_CHANGE = @INSTALL_CHANGE@ + +POSIX_DIRS_yes_V = posix POSIX_DIRS = $(POSIX_DIRS_$(HAS_POSIX_API)_V) -SUB_DIRS=score rtems $(POSIX_DIRS) sapi wrapup +SUB_DIRS = score rtems $(POSIX_DIRS) sapi wrapup -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/posix/Makefile.in b/c/src/exec/posix/Makefile.in index 161fe88a43..452b5c49cb 100644 --- a/c/src/exec/posix/Makefile.in +++ b/c/src/exec/posix/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../.. -subdir = c/src/exec/posix +top_builddir = .. +subdir = posix -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=include $(INLINE) optman src +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = include $(INLINE) optman src -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/posix/include/Makefile.in b/c/src/exec/posix/include/Makefile.in index 38c5eb5cc0..68916a609a 100644 --- a/c/src/exec/posix/include/Makefile.in +++ b/c/src/exec/posix/include/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/posix/include +top_builddir = ../.. +subdir = posix/include -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=wrap rtems sys +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = wrap rtems sys -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/posix/include/rtems/Makefile.in b/c/src/exec/posix/include/rtems/Makefile.in index d66f534bbd..5cb9c02f55 100644 --- a/c/src/exec/posix/include/rtems/Makefile.in +++ b/c/src/exec/posix/include/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/posix/include/rtems +top_builddir = ../../.. +subdir = posix/include/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=posix +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = posix -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/posix/include/rtems/posix/Makefile.in b/c/src/exec/posix/include/rtems/posix/Makefile.in index ccd0ce0b29..33d43cae10 100644 --- a/c/src/exec/posix/include/rtems/posix/Makefile.in +++ b/c/src/exec/posix/include/rtems/posix/Makefile.in @@ -5,32 +5,38 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/posix/include/rtems/posix +top_builddir = ../../../.. +subdir = posix/include/rtems/posix -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # We only build multiprocessing related files if HAS_MP was defined -MP_PIECES_yes_V = condmp mqueuemp mutexmp pthreadmp semaphoremp -MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) +MP_H_PIECES_yes_V = condmp mqueuemp mutexmp pthreadmp semaphoremp +MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V) -H_PIECES= cancel cond config key mqueue mutex posixapi \ - priority psignal pthread ptimer semaphore seterr threadsup time +H_PIECES = cancel cond config key mqueue mutex posixapi priority psignal \ + pthread ptimer semaphore seterr threadsup time $(MP_H_PIECES) #H_PIECES= cancel cond intr key mqueue mqueuemp mutex \ # mutexmp pthread pthreadmp priority semaphore semaphoremp threadsup \ # time -H_FILES=$(H_PIECES:%=$(srcdir)/%.h) +H_FILES = $(H_PIECES:%=$(srcdir)/%.h) -SRCS=$(H_FILES) +SRCS = $(H_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/posix + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -41,9 +47,11 @@ include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/posix +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/posix + +all: preinstall -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/posix/include/sys/Makefile.in b/c/src/exec/posix/include/sys/Makefile.in index f42f77018b..6edfed655c 100644 --- a/c/src/exec/posix/include/sys/Makefile.in +++ b/c/src/exec/posix/include/sys/Makefile.in @@ -5,24 +5,30 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/posix/include/sys +top_builddir = ../../.. +subdir = posix/include/sys -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -H_PIECES=utsname -H_FILES=$(H_PIECES:%=$(srcdir)/%.h) +H_PIECES = utsname +H_FILES = $(H_PIECES:%=$(srcdir)/%.h) -SRCS=$(H_FILES) +SRCS = $(H_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/sys + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -33,9 +39,11 @@ include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/sys +all: preinstall + +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/sys -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/posix/include/wrap/Makefile.in b/c/src/exec/posix/include/wrap/Makefile.in index 634e30238c..2cb73d883a 100644 --- a/c/src/exec/posix/include/wrap/Makefile.in +++ b/c/src/exec/posix/include/wrap/Makefile.in @@ -5,26 +5,32 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/posix/include/wrap +top_builddir = ../../.. +subdir = posix/include/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # RTEMS unistd.h needs to be checked against newlib's and removed #H_PIECES= aio devctl intr mqueue semaphore -H_PIECES= pthread sched aio mqueue semaphore -H_FILES=$(H_PIECES:%=$(srcdir)/../%.h) +H_PIECES = pthread sched aio mqueue semaphore +H_FILES = $(H_PIECES:%=$(srcdir)/../%.h) -SRCS=$(H_FILES) +SRCS = $(H_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -35,9 +41,11 @@ include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) +all: preinstall + +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/posix/inline/Makefile.in b/c/src/exec/posix/inline/Makefile.in index 71fe900ac7..6a2806ac74 100644 --- a/c/src/exec/posix/inline/Makefile.in +++ b/c/src/exec/posix/inline/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/posix/inline +top_builddir = ../.. +subdir = posix/inline -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/posix/inline/rtems/Makefile.in b/c/src/exec/posix/inline/rtems/Makefile.in index 07cab32916..91b2c98773 100644 --- a/c/src/exec/posix/inline/rtems/Makefile.in +++ b/c/src/exec/posix/inline/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/posix/inline/rtems +top_builddir = ../../.. +subdir = posix/inline/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=posix +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = posix -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/posix/inline/rtems/posix/Makefile.in b/c/src/exec/posix/inline/rtems/posix/Makefile.in index d23a410064..6f084c2dfa 100644 --- a/c/src/exec/posix/inline/rtems/posix/Makefile.in +++ b/c/src/exec/posix/inline/rtems/posix/Makefile.in @@ -5,25 +5,31 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/posix/inline/rtems/posix +top_builddir = ../../../.. +subdir = posix/inline/rtems/posix -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ #I_PIECES= cond intr key mqueue mutex pthread priority semaphore -I_PIECES=cond key mqueue mutex pthread priority semaphore -I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) +I_PIECES = cond key mqueue mutex pthread priority semaphore +I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) -SRCS=$(I_FILES) +SRCS = $(I_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/posix + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -34,9 +40,11 @@ include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/posix +all: preinstall + +preinstall: $(INSTALLDIRS) $(I_FILES) + @$(INSTALL_CHANGE) -m 644 $(I_FILES) $(PROJECT_INCLUDE)/rtems/posix -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/posix/macros/Makefile.in b/c/src/exec/posix/macros/Makefile.in index a5d5f72308..ca1eefc5a4 100644 --- a/c/src/exec/posix/macros/Makefile.in +++ b/c/src/exec/posix/macros/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/posix/macros +top_builddir = ../.. +subdir = posix/macros -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/posix/macros/rtems/Makefile.in b/c/src/exec/posix/macros/rtems/Makefile.in index 2d50b00f48..45b46be078 100644 --- a/c/src/exec/posix/macros/rtems/Makefile.in +++ b/c/src/exec/posix/macros/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/posix/macros/rtems +top_builddir = ../../.. +subdir = posix/macros/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=posix +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = posix -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/posix/macros/rtems/posix/Makefile.in b/c/src/exec/posix/macros/rtems/posix/Makefile.in index 97cc3fa1af..85e0634e32 100644 --- a/c/src/exec/posix/macros/rtems/posix/Makefile.in +++ b/c/src/exec/posix/macros/rtems/posix/Makefile.in @@ -5,26 +5,32 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/posix/macros/rtems/posix +top_builddir = ../../../.. +subdir = posix/macros/rtems/posix -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # Right now there are not macro implementation of the posix inline routines # So it won't build -I_PIECES= -I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) +I_PIECES = +I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) -SRCS=$(I_FILES) +SRCS = $(I_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/posix + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -35,9 +41,11 @@ include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - #$(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/posix +all: preinstall + +preinstall: $(INSTALLDIRS) $(I_FILES) + @$(INSTALL_CHANGE) -m 644 $(I_FILES) $(PROJECT_INCLUDE)/rtems/posix -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/posix/optman/Makefile.in b/c/src/exec/posix/optman/Makefile.in index f4da939a0a..76709e59e2 100644 --- a/c/src/exec/posix/optman/Makefile.in +++ b/c/src/exec/posix/optman/Makefile.in @@ -5,40 +5,40 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/posix/optman +top_builddir = ../.. +subdir = posix/optman -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -C_FILES= +C_FILES = -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -PGMS=$(C_FILES:%.c=$(ARCH)/%.rel) +PGMS = $(C_FILES:%.c=$(ARCH)/%.rel) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -ASM4FLAGS += -I $(PROJECT_INCLUDE)/rtems -LD_PATHS += -LD_LIBS += -LDFLAGS += +ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -50,9 +50,9 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) $(OBJS) $(PGMS) - #$(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(OBJS) $(PGMS) + #$(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/posix/src/Makefile.in b/c/src/exec/posix/src/Makefile.in index fb6146dc10..7fef9753cd 100644 --- a/c/src/exec/posix/src/Makefile.in +++ b/c/src/exec/posix/src/Makefile.in @@ -5,12 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/posix/src +top_builddir = ../.. +subdir = posix/src -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ @@ -19,52 +17,49 @@ VPATH = @srcdir@ # C_PIECES=aio cancel devctl intr mqueue semaphore utsname # These are really in the stand but not really functional -BUILD_FOR_NOW_C_PIECES=aio cancel mqueue semaphore utsname - -ENOSYS_C_PIECES=\ - execl execle execlp execv execve execvp fork \ - pthreadatfork wait waitpid - -PTHREAD_PIECES=\ - pthread pthreadsetcputime pthreadgetcputime pthreadgetcpuclockid \ - pthreadonce pthreadequal pthreadself pthreadexit pthreaddetach \ - pthreadjoin pthreadcreate \ - pthreadattrsetdetachstate pthreadattrgetdetachstate \ - pthreadattrgetstackaddr pthreadattrsetstackaddr \ - pthreadattrgetstacksize pthreadattrsetstacksize \ - pthreadattrinit pthreadattrdestroy \ - pthreadsetschedparam pthreadgetschedparam \ - pthreadattrsetschedparam pthreadattrgetschedparam \ - pthreadattrgetschedpolicy pthreadattrsetschedpolicy \ - pthreadattrgetinheritsched pthreadattrsetinheritsched \ - pthreadattrgetscope pthreadattrsetscope - -PSIGNAL_PIECES=\ - psignal alarm kill killinfo pause pthreadkill pthreadsigmask \ - sigaction sigaddset sigdelset sigemptyset sigfillset sigismember \ - sigpending sigprocmask sigqueue sigsuspend sigtimedwait sigwait \ - sigwaitinfo signal_2 - -C_PIECES= adasupp cond getpid key mutex $(PTHREAD_PIECES) \ - $(PSIGNAL_PIECES) ptimer sched time \ - types unistd $(ENOSYS_C_PIECES) $(BUILD_FOR_NOW_C_PIECES) - -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) - -SRCS=$(C_FILES) $(CC_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) - -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +BUILD_FOR_NOW_C_PIECES = aio cancel mqueue semaphore utsname + +ENOSYS_C_PIECES = execl execle execlp execv execve execvp fork pthreadatfork \ + wait waitpid + +PTHREAD_C_PIECES = pthread pthreadsetcputime pthreadgetcputime \ + pthreadgetcpuclockid pthreadonce pthreadequal pthreadself pthreadexit \ + pthreaddetach pthreadjoin pthreadcreate pthreadattrsetdetachstate \ + pthreadattrgetdetachstate pthreadattrgetstackaddr \ + pthreadattrsetstackaddr pthreadattrgetstacksize pthreadattrsetstacksize \ + pthreadattrinit pthreadattrdestroy pthreadsetschedparam \ + pthreadgetschedparam pthreadattrsetschedparam pthreadattrgetschedparam \ + pthreadattrgetschedpolicy pthreadattrsetschedpolicy \ + pthreadattrgetinheritsched pthreadattrsetinheritsched \ + pthreadattrgetscope pthreadattrsetscope + +PSIGNAL_C_PIECES = psignal alarm kill killinfo pause pthreadkill \ + pthreadsigmask sigaction sigaddset sigdelset sigemptyset sigfillset \ + sigismember sigpending sigprocmask sigqueue sigsuspend sigtimedwait \ + sigwait sigwaitinfo signal_2 + +C_PIECES = adasupp cond getpid key mutex $(PTHREAD_C_PIECES) \ + $(PSIGNAL_C_PIECES) ptimer sched time types unistd $(ENOSYS_C_PIECES) \ + $(BUILD_FOR_NOW_C_PIECES) + +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) + +SRCS = $(C_FILES) $(CC_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # Add local stuff here using += # -DEFINES += -D__RTEMS_INSIDE__ +DEFINES += -D__RTEMS_INSIDE__ CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) # # Add your list of files to delete here. The config files @@ -73,13 +68,13 @@ CFLAGS += $(CFLAGS_OS_V) # 'make clobber' already includes 'make clean' # -CLEAN_ADDITIONS += +CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) ${OBJS} +all: ${ARCH} $(SRCS) ${OBJS} # temporary so we can see how many things are left to implement -not: +not: grep -i NOT_IMPL $(C_FILES) | grep -v MP_NOT_IMPL @echo @echo @@ -87,6 +82,6 @@ not: @echo `grep -i NOT_IMPL $(C_FILES) | grep -v MP_NOT_IMPL | wc -l ` places marked not implemented @echo `wc -l $(C_FILES) | grep total` lines of C code to test -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/rtems/Makefile.in b/c/src/exec/rtems/Makefile.in index 4e814be59f..bc90b24a39 100644 --- a/c/src/exec/rtems/Makefile.in +++ b/c/src/exec/rtems/Makefile.in @@ -5,21 +5,30 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../.. -subdir = c/src/exec/rtems +top_builddir = .. +subdir = rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=include $(INLINE) optman src +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/rtems + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + +SUB_DIRS = include $(INLINE) optman src + +preinstall: + $(mkinstalldirs) $(INSTALLDIRS) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/rtems/include/Makefile.in b/c/src/exec/rtems/include/Makefile.in index 3fe8c3e185..9919d92014 100644 --- a/c/src/exec/rtems/include/Makefile.in +++ b/c/src/exec/rtems/include/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/rtems/include +top_builddir = ../.. +subdir = rtems/include -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=wrap rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = wrap rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/rtems/include/rtems/Makefile.in b/c/src/exec/rtems/include/rtems/Makefile.in index 537ef76931..30201e5942 100644 --- a/c/src/exec/rtems/include/rtems/Makefile.in +++ b/c/src/exec/rtems/include/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/rtems/include/rtems +top_builddir = ../../.. +subdir = rtems/include/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/rtems/include/rtems/rtems/Makefile.in b/c/src/exec/rtems/include/rtems/rtems/Makefile.in index ac4298e659..a1f93027e7 100644 --- a/c/src/exec/rtems/include/rtems/rtems/Makefile.in +++ b/c/src/exec/rtems/include/rtems/rtems/Makefile.in @@ -5,31 +5,36 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/rtems/include/rtems/rtems +top_builddir = ../../../.. +subdir = rtems/include/rtems/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # We only build multiprocessing related files if HAS_MP was defined -MP_PIECES_yes_V = eventmp mp msgmp partmp regionmp semmp signalmp taskmp -MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) +MP_H_PIECES_yes_V = eventmp mp msgmp partmp regionmp semmp signalmp taskmp +MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V) -H_PIECES=asr attr clock config dpmem event eventset \ - intr message modes options part \ - ratemon region rtemsapi sem signal status \ - support tasks timer types $(MP_PIECES) -H_FILES=$(H_PIECES:%=$(srcdir)/%.h) +H_PIECES = asr attr clock config dpmem event eventset intr message modes \ + options part ratemon region rtemsapi sem signal status support tasks \ + timer types $(MP_H_PIECES) +H_FILES = $(H_PIECES:%=$(srcdir)/%.h) -SRCS=$(H_FILES) +SRCS = $(H_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/rtems + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -40,9 +45,11 @@ include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/rtems +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/rtems + +all: preinstall -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/rtems/include/wrap/Makefile.in b/c/src/exec/rtems/include/wrap/Makefile.in index 52857c7307..bd613c36d4 100644 --- a/c/src/exec/rtems/include/wrap/Makefile.in +++ b/c/src/exec/rtems/include/wrap/Makefile.in @@ -5,24 +5,30 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/rtems/include/wrap +top_builddir = ../../.. +subdir = rtems/include/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -H_PIECES=rtems -H_FILES=$(H_PIECES:%=$(srcdir)/../%.h) +H_PIECES = rtems +H_FILES = $(H_PIECES:%=$(srcdir)/../%.h) -SRCS=$(H_FILES) +SRCS = $(H_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -33,9 +39,11 @@ include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) +all: preinstall + +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/rtems/inline/Makefile.in b/c/src/exec/rtems/inline/Makefile.in index f3cd6c8507..8fb24d9f5b 100644 --- a/c/src/exec/rtems/inline/Makefile.in +++ b/c/src/exec/rtems/inline/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/rtems/inline +top_builddir = ../.. +subdir = rtems/inline -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/rtems/inline/rtems/Makefile.in b/c/src/exec/rtems/inline/rtems/Makefile.in index 1e12c0ef05..c2efbeca1e 100644 --- a/c/src/exec/rtems/inline/rtems/Makefile.in +++ b/c/src/exec/rtems/inline/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/rtems/inline/rtems +top_builddir = ../../.. +subdir = rtems/inline/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/rtems/inline/rtems/rtems/Makefile.in b/c/src/exec/rtems/inline/rtems/rtems/Makefile.in index f3b56f9330..fff81d3c22 100644 --- a/c/src/exec/rtems/inline/rtems/rtems/Makefile.in +++ b/c/src/exec/rtems/inline/rtems/rtems/Makefile.in @@ -5,25 +5,31 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/rtems/inline/rtems/rtems +top_builddir = ../../../.. +subdir = rtems/inline/rtems/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -I_PIECES=asr attr dpmem event eventset message modes options \ - part ratemon region sem status support tasks timer -I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) +I_PIECES = asr attr dpmem event eventset message modes options part ratemon \ + region sem status support tasks timer +I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) -SRCS=$(I_FILES) +SRCS = $(I_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/rtems + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -34,9 +40,11 @@ include $(RTEMS_ROOT)/make/lib.cfg CLEAN_ADDITIONS += $(LIB) CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/rtems +all: preinstall + +preinstall: $(INSTALLDIRS) $(I_FILES) + @$(INSTALL_CHANGE) -m 644 $(I_FILES) $(PROJECT_INCLUDE)/rtems/rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/rtems/macros/Makefile.in b/c/src/exec/rtems/macros/Makefile.in index 5071720358..0488c6d862 100644 --- a/c/src/exec/rtems/macros/Makefile.in +++ b/c/src/exec/rtems/macros/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/rtems/macros +top_builddir = ../.. +subdir = rtems/macros -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/rtems/macros/rtems/Makefile.in b/c/src/exec/rtems/macros/rtems/Makefile.in index cb3b0ce2b5..98bd4b4c80 100644 --- a/c/src/exec/rtems/macros/rtems/Makefile.in +++ b/c/src/exec/rtems/macros/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/rtems/macros/rtems +top_builddir = ../../.. +subdir = rtems/macros/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/rtems/macros/rtems/rtems/Makefile.in b/c/src/exec/rtems/macros/rtems/rtems/Makefile.in index 6ff1b2bc9c..14604b688d 100644 --- a/c/src/exec/rtems/macros/rtems/rtems/Makefile.in +++ b/c/src/exec/rtems/macros/rtems/rtems/Makefile.in @@ -5,25 +5,31 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/rtems/macros/rtems/rtems +top_builddir = ../../../.. +subdir = rtems/macros/rtems/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -I_PIECES=asr attr dpmem event eventset message modes options \ - part ratemon region sem status support tasks timer -I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) +I_PIECES = asr attr dpmem event eventset message modes options part ratemon \ + region sem status support tasks timer +I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) -SRCS=$(I_FILES) +SRCS = $(I_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/rtems + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -34,9 +40,11 @@ include $(RTEMS_ROOT)/make/lib.cfg CLEAN_ADDITIONS += $(LIB) CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/rtems +all: preinstall + +preinstall: $(INSTALLDIRS) $(I_FILES) + @$(INSTALL_CHANGE) -m 644 $(I_FILES) $(PROJECT_INCLUDE)/rtems/rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/rtems/optman/Makefile.in b/c/src/exec/rtems/optman/Makefile.in index d47fccf0ac..ce74d73596 100644 --- a/c/src/exec/rtems/optman/Makefile.in +++ b/c/src/exec/rtems/optman/Makefile.in @@ -5,43 +5,43 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/rtems/optman +top_builddir = ../.. +subdir = rtems/optman -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -C_FILES= no-dpmem.c no-event.c no-msg.c no-mp.c \ - no-part.c no-region.c no-rtmon.c no-sem.c no-signal.c no-timer.c +C_FILES = no-dpmem.c no-event.c no-msg.c no-mp.c no-part.c no-region.c \ + no-rtmon.c no-sem.c no-signal.c no-timer.c -S_FILES= +S_FILES = -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) -PGMS=$(C_FILES:%.c=$(ARCH)/%.rel) +PGMS = $(C_FILES:%.c=$(ARCH)/%.rel) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -ASM4FLAGS += -I $(PROJECT_INCLUDE)/rtems -LD_PATHS += -LD_LIBS += -LDFLAGS += +ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -53,9 +53,9 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) $(OBJS) $(PGMS) - $(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(OBJS) $(PGMS) + $(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/rtems/src/Makefile.in b/c/src/exec/rtems/src/Makefile.in index b04af25553..496ea7e48c 100644 --- a/c/src/exec/rtems/src/Makefile.in +++ b/c/src/exec/rtems/src/Makefile.in @@ -5,89 +5,77 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/rtems/src +top_builddir = ../.. +subdir = rtems/src -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # We only build multiprocessing related files if HAS_MP was defined -MP_PIECES_yes_V = eventmp mp msgmp partmp regionmp semmp signalmp taskmp -MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) +MP_C_PIECES_yes_V = eventmp mp msgmp partmp regionmp semmp signalmp taskmp +MP_C_PIECES = $(MP_C_PIECES_$(HAS_MP)_V) -TASK_PIECES=\ - tasks taskcreate taskdelete taskgetnote taskident taskinitusers \ - taskmode taskrestart taskresume tasksetnote tasksetpriority \ - taskstart tasksuspend taskwakeafter taskwakewhen +TASK_C_PIECES = tasks taskcreate taskdelete taskgetnote taskident \ + taskinitusers taskmode taskrestart taskresume tasksetnote \ + tasksetpriority taskstart tasksuspend taskwakeafter taskwakewhen -RATEMON_PIECES=\ - ratemon ratemoncancel ratemoncreate ratemondelete ratemongetstatus \ - ratemonident ratemonperiod ratemontimeout +RATEMON_C_PIECES = ratemon ratemoncancel ratemoncreate ratemondelete \ + ratemongetstatus ratemonident ratemonperiod ratemontimeout -INTR_PIECES=\ - intr intrbody intrcatch +INTR_C_PIECES = intr intrbody intrcatch -CLOCK_PIECES=\ - rtclock clockget clockset clocktick +CLOCK_C_PIECES = rtclock clockget clockset clocktick -TIMER_PIECES=\ - rtemstimer timercancel timercreate timerdelete timerfireafter \ - timerfirewhen timerident timerreset +TIMER_C_PIECES = rtemstimer timercancel timercreate timerdelete \ + timerfireafter timerfirewhen timerident timerreset -MESSAGE_QUEUE_PIECES=\ - msg msgqallocate msgqbroadcast msgqcreate msgqdelete \ - msgqflush msgqgetnumberpending msgqident msgqreceive \ - msgqsend msgqsubmit msgqtranslatereturncode msgqurgent +MESSAGE_QUEUE_C_PIECES = msg msgqallocate msgqbroadcast msgqcreate \ + msgqdelete msgqflush msgqgetnumberpending msgqident msgqreceive msgqsend \ + msgqsubmit msgqtranslatereturncode msgqurgent -SEMAPHORE_PIECES=\ - sem semcreate semdelete semident semobtain semrelease \ - semtranslatereturncode +SEMAPHORE_C_PIECES = sem semcreate semdelete semident semobtain semrelease \ + semtranslatereturncode -EVENT_PIECES=\ - event eventreceive eventseize eventsend eventsurrender eventtimeout +EVENT_C_PIECES = event eventreceive eventseize eventsend eventsurrender \ + eventtimeout -SIGNAL_PIECES=\ - signal signalcatch signalsend +SIGNAL_C_PIECES = signal signalcatch signalsend -REGION_PIECES=\ - region regioncreate regiondelete regionextend regiongetsegment \ - regiongetsegmentsize regionident regionreturnsegment regionreturnsegment +REGION_C_PIECES = region regioncreate regiondelete regionextend \ + regiongetsegment regiongetsegmentsize regionident regionreturnsegment \ + regionreturnsegment -PARTITION_PIECES=\ - part partcreate partdelete partgetbuffer partident partreturnbuffer +PARTITION_C_PIECES = part partcreate partdelete partgetbuffer partident \ + partreturnbuffer -DPMEM_PIECES=\ - dpmem dpmemcreate dpmemdelete dpmemexternal2internal \ - dpmemident dpmeminternal2external +DPMEM_C_PIECES = dpmem dpmemcreate dpmemdelete dpmemexternal2internal \ + dpmemident dpmeminternal2external -C_PIECES=\ - attr $(TASK_PIECES) $(RATEMON_PIECES) \ - $(INTR_PIECES) \ - $(CLOCK_PIECES) $(TIMER_PIECES) \ - $(SEMAPHORE_PIECES) $(MESSAGE_QUEUE_PIECES) \ - $(EVENT_PIECES) $(SIGNAL_PIECES) \ - $(PARTITION_PIECES) $(REGION_PIECES) $(DPMEM_PIECES) \ - $(MP_PIECES) -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = attr $(TASK_C_PIECES) $(RATEMON_C_PIECES) $(INTR_C_PIECES) \ + $(CLOCK_C_PIECES) $(TIMER_C_PIECES) $(SEMAPHORE_C_PIECES) \ + $(MESSAGE_QUEUE_C_PIECES) $(EVENT_C_PIECES) $(SIGNAL_C_PIECES) \ + $(PARTITION_C_PIECES) $(REGION_C_PIECES) $(DPMEM_C_PIECES) \ + $(MP_C_PIECES) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -SRCS=$(C_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # Add local stuff here using += # -DEFINES += -D__RTEMS_INSIDE__ +DEFINES += -D__RTEMS_INSIDE__ CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) # # Add your list of files to delete here. The config files @@ -96,11 +84,11 @@ CFLAGS += $(CFLAGS_OS_V) # 'make clobber' already includes 'make clean' # -CLEAN_ADDITIONS += +CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) ${OBJS} +all: ${ARCH} $(SRCS) ${OBJS} -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/sapi/Makefile.in b/c/src/exec/sapi/Makefile.in index 06edb531ce..af1d200031 100644 --- a/c/src/exec/sapi/Makefile.in +++ b/c/src/exec/sapi/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../.. -subdir = c/src/exec/sapi +top_builddir = .. +subdir = sapi -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=include $(INLINE) optman src +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = include $(INLINE) optman src -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/sapi/include/Makefile.in b/c/src/exec/sapi/include/Makefile.in index b36fec8002..11da8f0e1e 100644 --- a/c/src/exec/sapi/include/Makefile.in +++ b/c/src/exec/sapi/include/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/sapi/include +top_builddir = ../.. +subdir = sapi/include -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=wrap rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = wrap rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/sapi/include/rtems/Makefile.in b/c/src/exec/sapi/include/rtems/Makefile.in index 710ab6321c..625fc5002e 100644 --- a/c/src/exec/sapi/include/rtems/Makefile.in +++ b/c/src/exec/sapi/include/rtems/Makefile.in @@ -5,24 +5,30 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/sapi/include/rtems +top_builddir = ../../.. +subdir = sapi/include/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -H_PIECES= config directives extension fatal init io mptables -H_FILES=$(H_PIECES:%=$(srcdir)/%.h) +H_PIECES = config directives extension fatal init io mptables +H_FILES = $(H_PIECES:%=$(srcdir)/%.h) sptables.h -SRCS=$(H_FILES) +SRCS = $(H_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -33,16 +39,15 @@ include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) $(ARCH) $(PROJECT_INCLUDE)/rtems/sptables.h - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/ +all: preinstall -$(PROJECT_INCLUDE)/rtems/sptables.h: $(ARCH)/sptables.h-tmp - $(INSTALL_CHANGE) -m 444 $(ARCH)/sptables.h-tmp $@ +preinstall: $(INSTALLDIRS) $(H_FILES) + $(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems -$(ARCH)/sptables.h-tmp: $(srcdir)/sptables.h - $(SED) -e 's?REPLACE_THIS_WITH_THE_BSP?${RTEMS_BSP}?' \ - < $< >$(ARCH)/sptables.h-tmp +sptables.h: $(srcdir)/sptables.h.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/sapi/include/rtems/sptables.h b/c/src/exec/sapi/include/rtems/sptables.h.in index 74838f46e0..737095a7de 100644 --- a/c/src/exec/sapi/include/rtems/sptables.h +++ b/c/src/exec/sapi/include/rtems/sptables.h.in @@ -63,11 +63,11 @@ const rtems_multiprocessing_table * This is the version string. */ -#define RTEMS_VERSION "rtems-19990709" +#define RTEMS_VERSION "rtems-@RTEMS_VERSION@" const char _RTEMS_version[] = "RTEMS RELEASE " RTEMS_VERSION - "(" CPU_NAME "/" CPU_MODEL_NAME "/REPLACE_THIS_WITH_THE_BSP)"; + "(" CPU_NAME "/" CPU_MODEL_NAME "/@RTEMS_BSP@)"; #ifdef __cplusplus } diff --git a/c/src/exec/sapi/include/wrap/Makefile.in b/c/src/exec/sapi/include/wrap/Makefile.in index 4bf1019d5e..be81ed1405 100644 --- a/c/src/exec/sapi/include/wrap/Makefile.in +++ b/c/src/exec/sapi/include/wrap/Makefile.in @@ -5,24 +5,30 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/sapi/include/wrap +top_builddir = ../../.. +subdir = sapi/include/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -H_PIECES= confdefs -H_FILES=$(H_PIECES:%=$(srcdir)/../%.h) +H_PIECES = confdefs +H_FILES = $(H_PIECES:%=$(srcdir)/../%.h) -SRCS=$(H_FILES) +SRCS = $(H_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -33,9 +39,11 @@ include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) +all: preinstall + +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/sapi/inline/Makefile.in b/c/src/exec/sapi/inline/Makefile.in index 4fbe388066..e5f1ececba 100644 --- a/c/src/exec/sapi/inline/Makefile.in +++ b/c/src/exec/sapi/inline/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/sapi/inline +top_builddir = ../.. +subdir = sapi/inline -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/sapi/inline/rtems/Makefile.in b/c/src/exec/sapi/inline/rtems/Makefile.in index de2ce1a78a..edde0a21ad 100644 --- a/c/src/exec/sapi/inline/rtems/Makefile.in +++ b/c/src/exec/sapi/inline/rtems/Makefile.in @@ -5,24 +5,30 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/sapi/inline/rtems +top_builddir = ../../.. +subdir = sapi/inline/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -I_PIECES= extension -I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) +I_PIECES = extension +I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) -SRCS=$(I_FILES) +SRCS = $(I_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -33,9 +39,11 @@ include $(RTEMS_ROOT)/make/lib.cfg CLEAN_ADDITIONS += $(LIB) CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems +all: preinstall + +preinstall: $(INSTALLDIRS) $(I_FILES) + @$(INSTALL_CHANGE) -m 644 $(I_FILES) $(PROJECT_INCLUDE)/rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/sapi/macros/Makefile.in b/c/src/exec/sapi/macros/Makefile.in index 827ba24a42..ada243130d 100644 --- a/c/src/exec/sapi/macros/Makefile.in +++ b/c/src/exec/sapi/macros/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/sapi/macros +top_builddir = ../.. +subdir = sapi/macros -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/sapi/macros/rtems/Makefile.in b/c/src/exec/sapi/macros/rtems/Makefile.in index 81c65b5883..655af19562 100644 --- a/c/src/exec/sapi/macros/rtems/Makefile.in +++ b/c/src/exec/sapi/macros/rtems/Makefile.in @@ -5,24 +5,30 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/sapi/macros/rtems +top_builddir = ../../.. +subdir = sapi/macros/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -I_PIECES= extension -I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) +I_PIECES = extension +I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) -SRCS=$(I_FILES) +SRCS = $(I_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -33,9 +39,11 @@ include $(RTEMS_ROOT)/make/lib.cfg CLEAN_ADDITIONS += $(LIB) CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems +preinstall: $(INSTALLDIRS) $(I_FILES) + @$(INSTALL_CHANGE) -m 644 $(I_FILES) $(PROJECT_INCLUDE)/rtems + +all: preinstall -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/sapi/optman/Makefile.in b/c/src/exec/sapi/optman/Makefile.in index d77d946357..5dcf995120 100644 --- a/c/src/exec/sapi/optman/Makefile.in +++ b/c/src/exec/sapi/optman/Makefile.in @@ -5,40 +5,40 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/sapi/optman +top_builddir = ../.. +subdir = sapi/optman -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -C_FILES= no-ext.c no-io.c +C_FILES = no-ext.c no-io.c -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) $(S_O_FILES) -PGMS=$(C_FILES:%.c=$(ARCH)/%.rel) +PGMS = $(C_FILES:%.c=$(ARCH)/%.rel) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) ASM4FLAGS += -I $(PROJECT_INCLUDE)/rtems -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -50,9 +50,9 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) $(OBJS) $(PGMS) - $(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(OBJS) $(PGMS) + $(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/sapi/src/Makefile.in b/c/src/exec/sapi/src/Makefile.in index 93aedc4884..030eaaa4d1 100644 --- a/c/src/exec/sapi/src/Makefile.in +++ b/c/src/exec/sapi/src/Makefile.in @@ -5,33 +5,33 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/sapi/src +top_builddir = ../.. +subdir = sapi/src -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -C_PIECES= debug entrytable extension fatal exinit io posixapi rtemsapi -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = debug entrytable extension fatal exinit io posixapi rtemsapi +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -SRCS=$(C_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # Add local stuff here using += # -DEFINES += -D__RTEMS_INSIDE__ +DEFINES += -D__RTEMS_INSIDE__ CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) # # Add your list of files to delete here. The config files @@ -40,11 +40,11 @@ CFLAGS += $(CFLAGS_OS_V) # 'make clobber' already includes 'make clean' # -CLEAN_ADDITIONS += +CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) ${OBJS} +all: ${ARCH} $(SRCS) ${OBJS} -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/Makefile.in b/c/src/exec/score/Makefile.in index af89e210c2..a0e1da3d81 100644 --- a/c/src/exec/score/Makefile.in +++ b/c/src/exec/score/Makefile.in @@ -5,21 +5,30 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../.. -subdir = c/src/exec/score +top_builddir = .. +subdir = score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=include $(INLINE) tools cpu src +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + +SUB_DIRS = include $(INLINE) cpu src + +preinstall: + $(mkinstalldirs) $(INSTALLDIRS) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/Makefile.in b/c/src/exec/score/cpu/Makefile.in index bd4dcfcace..b3cf43c129 100644 --- a/c/src/exec/score/cpu/Makefile.in +++ b/c/src/exec/score/cpu/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/score/cpu +top_builddir = ../.. +subdir = score/cpu -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=$(RTEMS_CPU) +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = $(RTEMS_CPU) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/a29k/Makefile.in b/c/src/exec/score/cpu/a29k/Makefile.in index eca4ae3e84..77189b6ebf 100644 --- a/c/src/exec/score/cpu/a29k/Makefile.in +++ b/c/src/exec/score/cpu/a29k/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/a29k +top_builddir = ../../.. +subdir = score/cpu/a29k -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/a29k/rtems/Makefile.in b/c/src/exec/score/cpu/a29k/rtems/Makefile.in index 858e8a9d05..4223a60d7c 100644 --- a/c/src/exec/score/cpu/a29k/rtems/Makefile.in +++ b/c/src/exec/score/cpu/a29k/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/a29k/rtems +top_builddir = ../../../.. +subdir = score/cpu/a29k/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/a29k/rtems/score/Makefile.in b/c/src/exec/score/cpu/a29k/rtems/score/Makefile.in index 01e9cbe014..5ca7a8a600 100644 --- a/c/src/exec/score/cpu/a29k/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/a29k/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/a29k/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/a29k/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=a29k.h a29ktypes.h cpu.h cpu_asm.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = a29k.h a29ktypes.h cpu.h cpu_asm.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/a29k/wrap/Makefile.in b/c/src/exec/score/cpu/a29k/wrap/Makefile.in index f06c307655..6bba7cdf65 100644 --- a/c/src/exec/score/cpu/a29k/wrap/Makefile.in +++ b/c/src/exec/score/cpu/a29k/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/a29k/wrap +top_builddir = ../../../.. +subdir = score/cpu/a29k/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c -C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = cpu +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = amd.ah asm.h cpu_asm.h pswmacro.ah register.ah -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm sig -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/hppa1.1/Makefile.in b/c/src/exec/score/cpu/hppa1.1/Makefile.in index 70ce803133..51f1dd9be6 100644 --- a/c/src/exec/score/cpu/hppa1.1/Makefile.in +++ b/c/src/exec/score/cpu/hppa1.1/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/hppa1.1 +top_builddir = ../../.. +subdir = score/cpu/hppa1.1 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in b/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in index 8e5a41fa53..bc40b4454c 100644 --- a/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in +++ b/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/hppa1.1/rtems +top_builddir = ../../../.. +subdir = score/cpu/hppa1.1/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.in b/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.in index 02bb5dd613..f5d976b409 100644 --- a/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.in @@ -5,12 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/hppa1.1/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/hppa1.1/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ @@ -18,40 +16,49 @@ VPATH = @srcdir@ BUILT_SOURCES = offsets.h # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h hppa.h cpu_asm.h hppatypes.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) offsets.h +H_PIECES = cpu.h hppa.h cpu_asm.h hppatypes.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) offsets.h # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + +GENOFFSETS = $(PROJECT_ROOT)/tools/cpu/hppa1.1/genoffsets + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += offsets.h: $(GENOFFSETS) cpu.h $(RM) $@ $(GENOFFSETS) > $@ - $(CHMOD) -w $@ # # Add your list of files to delete here. The config files @@ -65,13 +72,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in b/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in index c03b653d21..b53df079a8 100644 --- a/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in +++ b/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/hppa1.1/wrap +top_builddir = ../../../.. +subdir = score/cpu/hppa1.1/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES = -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_PIECES = +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm rtems -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i386/Makefile.in b/c/src/exec/score/cpu/i386/Makefile.in index 142630b05a..7c55ed596a 100644 --- a/c/src/exec/score/cpu/i386/Makefile.in +++ b/c/src/exec/score/cpu/i386/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/i386 +top_builddir = ../../.. +subdir = score/cpu/i386 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i386/rtems/Makefile.in b/c/src/exec/score/cpu/i386/rtems/Makefile.in index f152d6d340..bd3aa34f9c 100644 --- a/c/src/exec/score/cpu/i386/rtems/Makefile.in +++ b/c/src/exec/score/cpu/i386/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/i386/rtems +top_builddir = ../../../.. +subdir = score/cpu/i386/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i386/rtems/score/Makefile.in b/c/src/exec/score/cpu/i386/rtems/score/Makefile.in index 2b5504a981..4bc752a8e0 100644 --- a/c/src/exec/score/cpu/i386/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/i386/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/i386/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/i386/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h i386.h i386types.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = cpu.h i386.h i386types.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i386/wrap/Makefile.in b/c/src/exec/score/cpu/i386/wrap/Makefile.in index 5cdc43fbb2..b7e005a8f2 100644 --- a/c/src/exec/score/cpu/i386/wrap/Makefile.in +++ b/c/src/exec/score/cpu/i386/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/i386/wrap +top_builddir = ../../../.. +subdir = score/cpu/i386/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i960/Makefile.in b/c/src/exec/score/cpu/i960/Makefile.in index d796b66dcd..b8455b537b 100644 --- a/c/src/exec/score/cpu/i960/Makefile.in +++ b/c/src/exec/score/cpu/i960/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/i960 +top_builddir = ../../.. +subdir = score/cpu/i960 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i960/rtems/Makefile.in b/c/src/exec/score/cpu/i960/rtems/Makefile.in index c46c893a31..bc6ebfa89b 100644 --- a/c/src/exec/score/cpu/i960/rtems/Makefile.in +++ b/c/src/exec/score/cpu/i960/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/i960/rtems +top_builddir = ../../../.. +subdir = score/cpu/i960/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i960/rtems/score/Makefile.in b/c/src/exec/score/cpu/i960/rtems/score/Makefile.in index 5c96ca0f31..751f69ff64 100644 --- a/c/src/exec/score/cpu/i960/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/i960/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/i960/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/i960/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h i960.h i960types.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = cpu.h i960.h i960types.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i960/wrap/Makefile.in b/c/src/exec/score/cpu/i960/wrap/Makefile.in index e572dbd937..ae2d6518a2 100644 --- a/c/src/exec/score/cpu/i960/wrap/Makefile.in +++ b/c/src/exec/score/cpu/i960/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/i960/wrap +top_builddir = ../../../.. +subdir = score/cpu/i960/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm rtems -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/m68k/Makefile.in b/c/src/exec/score/cpu/m68k/Makefile.in index 6374942996..fd39467bc7 100644 --- a/c/src/exec/score/cpu/m68k/Makefile.in +++ b/c/src/exec/score/cpu/m68k/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/m68k +top_builddir = ../../.. +subdir = score/cpu/m68k -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/m68k/rtems/Makefile.in b/c/src/exec/score/cpu/m68k/rtems/Makefile.in index efdac203ab..1ec77aa080 100644 --- a/c/src/exec/score/cpu/m68k/rtems/Makefile.in +++ b/c/src/exec/score/cpu/m68k/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/m68k/rtems +top_builddir = ../../../.. +subdir = score/cpu/m68k/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in index 7027ddeb60..3108e969fd 100644 --- a/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/m68k/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/m68k/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h m68k.h m68ktypes.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = cpu.h m68k.h m68ktypes.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/m68k/wrap/Makefile.in b/c/src/exec/score/cpu/m68k/wrap/Makefile.in index e254525fad..75cedf9c00 100644 --- a/c/src/exec/score/cpu/m68k/wrap/Makefile.in +++ b/c/src/exec/score/cpu/m68k/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/m68k/wrap +top_builddir = ../../../.. +subdir = score/cpu/m68k/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu memcpy -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h m68302.h m68360.h qsm.h sim.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/mips64orion/Makefile.in b/c/src/exec/score/cpu/mips64orion/Makefile.in index eab2f921d9..1dcb6268a8 100644 --- a/c/src/exec/score/cpu/mips64orion/Makefile.in +++ b/c/src/exec/score/cpu/mips64orion/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/mips64orion +top_builddir = ../../.. +subdir = score/cpu/mips64orion -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in b/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in index cab84284fa..57556e17a3 100644 --- a/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in +++ b/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/mips64orion/rtems +top_builddir = ../../../.. +subdir = score/cpu/mips64orion/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in b/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in index 182dba415e..dcb0a273bb 100644 --- a/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/mips64orion/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/mips64orion/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h mips64orion.h mipstypes.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = cpu.h mips64orion.h mipstypes.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in b/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in index cf0af8409b..4b85208aef 100644 --- a/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in +++ b/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/mips64orion/wrap +top_builddir = ../../../.. +subdir = score/cpu/mips64orion/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h cpu_asm.h idtcpu.h idtmon.h iregdef.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/no_cpu/Makefile.in b/c/src/exec/score/cpu/no_cpu/Makefile.in index e055f5115c..328077416d 100644 --- a/c/src/exec/score/cpu/no_cpu/Makefile.in +++ b/c/src/exec/score/cpu/no_cpu/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/no_cpu +top_builddir = ../../.. +subdir = score/cpu/no_cpu -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in b/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in index ed2d8c5d85..ca0ca45e05 100644 --- a/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in +++ b/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/no_cpu/rtems +top_builddir = ../../../.. +subdir = score/cpu/no_cpu/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in b/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in index c4671e7120..1eccbd61c9 100644 --- a/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/no_cpu/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/no_cpu/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h no_cpu.h no_cputypes.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = cpu.h no_cpu.h no_cputypes.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,12 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in b/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in index e5c27120bf..23f68c9819 100644 --- a/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in +++ b/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/no_cpu/wrap +top_builddir = ../../../.. +subdir = score/cpu/no_cpu/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu cpu_asm -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S -S_PIECES = -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,7 +71,7 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) $(OBJS) $(ARCH)/rtems.o $(RELS) +all: ${ARCH} $(SRCS) $(OBJS) $(ARCH)/rtems.o $(RELS) $(ARCH)/rtems.o: rtems.c @@ -75,11 +81,11 @@ $(ARCH)/rtems.o: rtems.c # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/powerpc/Makefile.in b/c/src/exec/score/cpu/powerpc/Makefile.in index 231f199ef3..00b07e15c4 100644 --- a/c/src/exec/score/cpu/powerpc/Makefile.in +++ b/c/src/exec/score/cpu/powerpc/Makefile.in @@ -1,33 +1,36 @@ # # $Id$ # -# +# # $Id$ # @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/powerpc - -INSTALL = @INSTALL@ +top_builddir = ../../.. +subdir = score/cpu/powerpc -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SHARED_LIB=shared +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SHARED_LIB = shared ifeq ($(RTEMS_CPU_MODEL),mpc750) -CPUDIR=mpc750 -else -CPUDIR=other_cpu -endif +CPUDIR = other_cpu +else +CPUDIR = other_cpu +endif -SUB_DIRS=$(CPUDIR) $(SHARED_LIB) +SUB_DIRS = $(CPUDIR) $(SHARED_LIB) +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/powerpc/mpc750/Makefile.in b/c/src/exec/score/cpu/powerpc/mpc750/Makefile.in index f50d88ca4d..547e9ab97e 100644 --- a/c/src/exec/score/cpu/powerpc/mpc750/Makefile.in +++ b/c/src/exec/score/cpu/powerpc/mpc750/Makefile.in @@ -5,54 +5,61 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/powerpc/wrap +top_builddir = ../../../.. +subdir = score/cpu/powerpc/mpc750 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) ROOT_H_PIECES = -ROOT_H_FILES=$(ROOT_H_PIECES:%=$(srcdir)/%) -RTEMS_SCORE_H_PIECES=cpu.h -RTEMS_SCORE_H_FILES=$(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%) -H_PIECES=$(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES) -H_FILES=$(H_PIECES%=$(srcdir)/%) -I_PIECES= c_isr -I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) +ROOT_H_FILES = $(ROOT_H_PIECES:%=$(srcdir)/%) +RTEMS_SCORE_H_PIECES = cpu.h +RTEMS_SCORE_H_FILES = $(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%) +H_PIECES = $(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES) +H_FILES = $(H_PIECES%=$(srcdir)/%) +I_PIECES = c_isr +I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) # Assembly source names, if any, go here -- minus the .S -S_PIECES = cpu_asm -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = cpu_asm +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) $(I_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) \ + $(I_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += -CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) +DEFINES += +CPPFLAGS += +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -61,23 +68,23 @@ LDFLAGS += # 'make clobber' already includes 'make clean' # -CLEAN_ADDITIONS += +CLEAN_ADDITIONS += CLOBBER_ADDITIONS += ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) $(make-rel) -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${RTEMS_SCORE_H_FILES} ${I_FILES} $(PROJECT_INCLUDE)/rtems/score - $(INSTALL_CHANGE) -m 444 ${ROOT_H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(RTEMS_SCORE_H_FILES) $(I_FILES) $(PROJECT_INCLUDE)/rtems/score + @$(INSTALL_CHANGE) -m 644 $(ROOT_H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/powerpc/other_cpu/Makefile.in b/c/src/exec/score/cpu/powerpc/other_cpu/Makefile.in index dd38dc7bf2..962cc60fc7 100644 --- a/c/src/exec/score/cpu/powerpc/other_cpu/Makefile.in +++ b/c/src/exec/score/cpu/powerpc/other_cpu/Makefile.in @@ -5,54 +5,61 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/powerpc/wrap +top_builddir = ../../../.. +subdir = score/cpu/powerpc/other_cpu -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu ppccache -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) ROOT_H_PIECES = -ROOT_H_FILES=$(ROOT_H_PIECES:%=$(srcdir)/%) -RTEMS_SCORE_H_PIECES=cpu.h -RTEMS_SCORE_H_FILES=$(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%) -H_PIECES=$(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES) -H_FILES=$(H_PIECES%=$(srcdir)/%) -I_PIECES= c_isr -I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) +ROOT_H_FILES = $(ROOT_H_PIECES:%=$(srcdir)/%) +RTEMS_SCORE_H_PIECES = cpu.h +RTEMS_SCORE_H_FILES = $(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%) +H_PIECES = $(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES) +H_FILES = $(H_PIECES%=$(srcdir)/%) +I_PIECES = c_isr +I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm rtems # irq_stub -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) $(I_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) \ + $(I_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += -CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) +DEFINES += +CPPFLAGS += +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -61,23 +68,23 @@ LDFLAGS += # 'make clobber' already includes 'make clean' # -CLEAN_ADDITIONS += +CLEAN_ADDITIONS += CLOBBER_ADDITIONS += ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) $(make-rel) -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${RTEMS_SCORE_H_FILES} ${I_FILES} $(PROJECT_INCLUDE)/rtems/score - $(INSTALL_CHANGE) -m 444 ${ROOT_H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(RTEMS_SCORE_H_FILES) $(I_FILES) $(PROJECT_INCLUDE)/rtems/score + @$(INSTALL_CHANGE) -m 644 $(ROOT_H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/powerpc/shared/Makefile.in b/c/src/exec/score/cpu/powerpc/shared/Makefile.in index 1b6dd81aa4..d42976055a 100644 --- a/c/src/exec/score/cpu/powerpc/shared/Makefile.in +++ b/c/src/exec/score/cpu/powerpc/shared/Makefile.in @@ -5,52 +5,58 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/powerpc/shared +top_builddir = ../../../.. +subdir = score/cpu/powerpc/shared -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -RELS= +RELS = # C source names, if any, go here -- minus the .c C_PIECES = -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) ROOT_H_PIECES = asm.h -ROOT_H_FILES=$(ROOT_H_PIECES:%=$(srcdir)/%) -RTEMS_SCORE_H_PIECES=ppc.h ppctypes.h -RTEMS_SCORE_H_FILES=$(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%) -H_PIECES=$(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES) -H_FILES=$(H_PIECES%=$(srcdir)/%) +ROOT_H_FILES = $(ROOT_H_PIECES:%=$(srcdir)/%) +RTEMS_SCORE_H_PIECES = ppc.h ppctypes.h +RTEMS_SCORE_H_FILES = $(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%) +H_PIECES = $(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES) +H_FILES = $(H_PIECES%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S S_PIECES = -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += -CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) +DEFINES += +CPPFLAGS += +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -59,19 +65,19 @@ LDFLAGS += # 'make clobber' already includes 'make clean' # -CLEAN_ADDITIONS += +CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all:$(SRCS) preinstall +all: $(SRCS) preinstall # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${RTEMS_SCORE_H_FILES} $(PROJECT_INCLUDE)/rtems/score - $(INSTALL_CHANGE) -m 444 ${ROOT_H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(RTEMS_SCORE_H_FILES) $(PROJECT_INCLUDE)/rtems/score + @$(INSTALL_CHANGE) -m 644 $(ROOT_H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/powerpc/wrap/Makefile.in b/c/src/exec/score/cpu/powerpc/wrap/Makefile.in index d7605800df..91b3b12375 100644 --- a/c/src/exec/score/cpu/powerpc/wrap/Makefile.in +++ b/c/src/exec/score/cpu/powerpc/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/powerpc/wrap +top_builddir = ../../../.. +subdir = score/cpu/powerpc/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu ppccache -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h mpc860.h mpc821.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm rtems # irq_stub -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sh/Makefile.in b/c/src/exec/score/cpu/sh/Makefile.in index 7e1411b994..3bea7f2412 100644 --- a/c/src/exec/score/cpu/sh/Makefile.in +++ b/c/src/exec/score/cpu/sh/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/sh +top_builddir = ../../.. +subdir = score/cpu/sh -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sh/rtems/Makefile.in b/c/src/exec/score/cpu/sh/rtems/Makefile.in index f5eb7680c9..71d7e66c5b 100644 --- a/c/src/exec/score/cpu/sh/rtems/Makefile.in +++ b/c/src/exec/score/cpu/sh/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/sh/rtems +top_builddir = ../../../.. +subdir = score/cpu/sh/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sh/rtems/score/Makefile.in b/c/src/exec/score/cpu/sh/rtems/score/Makefile.in index 38107ac4f5..26dcbfac46 100644 --- a/c/src/exec/score/cpu/sh/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/sh/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/sh/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/sh/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h shtypes.h sh.h sh_io.h cpu_isps.h iosh7030.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = cpu.h shtypes.h sh.h sh_io.h cpu_isps.h iosh7030.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sh/wrap/Makefile.in b/c/src/exec/score/cpu/sh/wrap/Makefile.in index 9a2bf7dff5..dc1460db2d 100644 --- a/c/src/exec/score/cpu/sh/wrap/Makefile.in +++ b/c/src/exec/score/cpu/sh/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/sh/wrap +top_builddir = ../../../.. +subdir = score/cpu/sh/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu cpu_asm cpu_isps -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S -S_PIECES = -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sparc/Makefile.in b/c/src/exec/score/cpu/sparc/Makefile.in index b21a928cf4..f67c8f5674 100644 --- a/c/src/exec/score/cpu/sparc/Makefile.in +++ b/c/src/exec/score/cpu/sparc/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/sparc +top_builddir = ../../.. +subdir = score/cpu/sparc -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sparc/rtems/Makefile.in b/c/src/exec/score/cpu/sparc/rtems/Makefile.in index b838f6aabc..b45baa7f32 100644 --- a/c/src/exec/score/cpu/sparc/rtems/Makefile.in +++ b/c/src/exec/score/cpu/sparc/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/sparc/rtems +top_builddir = ../../../.. +subdir = score/cpu/sparc/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in b/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in index 6bd1a5e05d..4f0f97e28d 100644 --- a/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/sparc/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/sparc/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h sparctypes.h sparc.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = cpu.h sparctypes.h sparc.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sparc/wrap/Makefile.in b/c/src/exec/score/cpu/sparc/wrap/Makefile.in index 143457b27d..996544f756 100644 --- a/c/src/exec/score/cpu/sparc/wrap/Makefile.in +++ b/c/src/exec/score/cpu/sparc/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/sparc/wrap +top_builddir = ../../../.. +subdir = score/cpu/sparc/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h erc32.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/unix/Makefile.in b/c/src/exec/score/cpu/unix/Makefile.in index 04ed540667..99ba94a777 100644 --- a/c/src/exec/score/cpu/unix/Makefile.in +++ b/c/src/exec/score/cpu/unix/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/unix +top_builddir = ../../.. +subdir = score/cpu/unix -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/unix/rtems/Makefile.in b/c/src/exec/score/cpu/unix/rtems/Makefile.in index d1ee822eae..7c1f9708c7 100644 --- a/c/src/exec/score/cpu/unix/rtems/Makefile.in +++ b/c/src/exec/score/cpu/unix/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/unix/rtems +top_builddir = ../../../.. +subdir = score/cpu/unix/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/unix/rtems/score/Makefile.in b/c/src/exec/score/cpu/unix/rtems/score/Makefile.in index cc9a50a434..c6b6629666 100644 --- a/c/src/exec/score/cpu/unix/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/unix/rtems/score/Makefile.in @@ -5,53 +5,60 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/unix/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/unix/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ +GENSIZE = $(PROJECT_ROOT)/tools/cpu/unix/gensize + BUILT_SOURCES = unixsize.h # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h unixtypes.h unix.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) unixsize.h +H_PIECES = cpu.h unixtypes.h unix.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) unixsize.h # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += unixsize.h: $(GENSIZE) cpu.h $(RM) $@ $(GENSIZE) > $@ - $(CHMOD) -w $@ # # Add your list of files to delete here. The config files @@ -65,13 +72,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/unix/wrap/Makefile.in b/c/src/exec/score/cpu/unix/wrap/Makefile.in index 4de8ca14bd..9cdf4abdc9 100644 --- a/c/src/exec/score/cpu/unix/wrap/Makefile.in +++ b/c/src/exec/score/cpu/unix/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/unix/wrap +top_builddir = ../../../.. +subdir = score/cpu/unix/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES = -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_PIECES = +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S -S_PIECES = -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += -DCPU_SYNC_IO $(LIBC_DEFINES) +DEFINES += -DCPU_SYNC_IO $(LIBC_DEFINES) CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,7 +71,7 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -73,11 +79,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/include/Makefile.in b/c/src/exec/score/include/Makefile.in index 9b153469b1..e4592afa71 100644 --- a/c/src/exec/score/include/Makefile.in +++ b/c/src/exec/score/include/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/score/include +top_builddir = ../.. +subdir = score/include -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/include/rtems/Makefile.in b/c/src/exec/score/include/rtems/Makefile.in index dfa5548186..edc41b25ac 100644 --- a/c/src/exec/score/include/rtems/Makefile.in +++ b/c/src/exec/score/include/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/include/rtems +top_builddir = ../../.. +subdir = score/include/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=wrap score +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = wrap score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/include/rtems/score/Makefile.in b/c/src/exec/score/include/rtems/score/Makefile.in index ca39cac589..87066d913b 100644 --- a/c/src/exec/score/include/rtems/score/Makefile.in +++ b/c/src/exec/score/include/rtems/score/Makefile.in @@ -5,37 +5,39 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/include/rtems/score +top_builddir = ../../../.. +subdir = score/include/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # We only build multiprocessing related files if HAS_MP was defined -MP_PIECES_yes_V = mpci mppkt objectmp threadmp -MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) +MP_H_PIECES_yes_V = mpci mppkt objectmp threadmp +MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V) # H_FILES that get installed in the rtems/score subdirectoy -H_PIECES= address apiext bitfield chain context copyrt coremsg coremutex \ - coresem heap interr isr object \ - priority stack states sysstate thread threadq \ - tod tqdata userext watchdog wkspace +H_PIECES = address apiext bitfield chain context copyrt coremsg coremutex \ + coresem heap interr isr object priority stack states sysstate thread \ + threadq tod tqdata userext watchdog wkspace $(MP_H_PIECES) +H_FILES = $(H_PIECES:%=$(srcdir)/%.h) +TARGOPTS = targopts.h -# Use this if compilation in location will be supported -# H_FILES=$(H_PIECES:%=$(srcdir)/%.h) targopts.h +SRCS = $(H_FILES) $(TARGOPTS) -# FIXME: Work-around -H_FILES=$(H_PIECES:%=$(srcdir)/%.h) -TARGOPTS=$(PROJECT_INCLUDE)/rtems/score/targopts.h +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(RTEMS_ROOT)/make/leaf.cfg -SRCS=$(H_FILES) $(TARGOPTS) +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg -include $(RTEMS_ROOT)/make/leaf.cfg +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + +RTEMS_USE_NEWLIB = @RTEMS_USE_NEWLIB@ # # Add your list of files to delete here. The config files @@ -54,10 +56,10 @@ CLOBBER_ADDITIONS += # gcc cpp predefines eliminate the need for RTEMS_CPU_MODEL # on some families but not on others. For example, the i386 # family does not give us enough information from the predefines. -RTEMS_CPU_DEFINED=$(subst .,_,$(RTEMS_CPU)) +RTEMS_CPU_DEFINED = $(subst .,_,$(RTEMS_CPU)) # make the target dependent options file -$(TARGOPTS): +$(TARGOPTS): @echo "/* target board dependent options file */" >$@ @echo "/* automatically generated -- DO NOT EDIT!! */" >>$@ @echo >>$@ @@ -74,34 +76,36 @@ $(TARGOPTS): @echo "#endif" >>$@ @echo "#define $(RTEMS_CPU_MODEL) 1" >>$@ @echo >>$@ - @echo "#ifdef ${RTEMS_BSP}" >>$@ - @echo "#undef ${RTEMS_BSP}" >>$@ + @echo "#ifdef @RTEMS_BSP@" >>$@ + @echo "#undef @RTEMS_BSP@" >>$@ @echo "#endif" >>$@ - @echo "#define ${RTEMS_BSP} 1" >>$@ + @echo "#define @RTEMS_BSP@ 1" >>$@ @echo >>$@ @$(make-target-options) -ifeq (${RTEMS_USE_MACROS},yes) - @echo "#define USE_MACROS 1" >>$@ -else - @echo "#define USE_INLINES 1" >>$@ -endif -ifeq ($(HAS_MULTIPROCESSING),yes) - @echo "#define RTEMS_MULTIPROCESSING 1" >>$@ -endif -ifeq ($(HAS_POSIX_API),yes) - @echo "#define RTEMS_POSIX_API 1" >>$@ -endif -ifeq ($(RTEMS_USE_NEWLIB),yes) - @echo "#define RTEMS_NEWLIB 1" >>$@ - @echo "#define MALLOC_PROVIDED 1" >>$@ -endif + @if test "$(RTEMS_USE_MACROS)" = "yes"; then \ + echo "#define USE_MACROS 1" >>$@; \ + else \ + echo "#define USE_INLINES 1" >>$@; \ + fi + if test "$(HAS_MP)" = "yes"; then \ + echo "#define RTEMS_MULTIPROCESSING 1" >>$@; \ + fi + @if test "$(HAS_POSIX_API)" = "yes"; then \ + echo "#define RTEMS_POSIX_API 1" >>$@; \ + fi + @if test "$(RTEMS_USE_NEWLIB)" = "yes"; then \ + echo "#define RTEMS_NEWLIB 1" >>$@; \ + echo "#define MALLOC_PROVIDED 1" >>$@; \ + fi @echo >>$@ @echo "#endif" >>$@ - @chmod 755 $@ -all: $(SRCS) - $(INSTALL_CHANGE) ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall + +preinstall: $(INSTALLDIRS) $(H_FILES) $(TARGOPTS) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score + @$(INSTALL_CHANGE) -m 644 $(TARGOPTS) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/include/rtems/wrap/Makefile.in b/c/src/exec/score/include/rtems/wrap/Makefile.in index 3d5299e7b4..3a03ce1e3b 100644 --- a/c/src/exec/score/include/rtems/wrap/Makefile.in +++ b/c/src/exec/score/include/rtems/wrap/Makefile.in @@ -5,27 +5,35 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/include/rtems/wrap +top_builddir = ../../../.. +subdir = score/include/rtems/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -H_PIECES=debug system -H_FILES=$(H_PIECES:%=$(srcdir)/../%.h) +H_PIECES = debug system +H_FILES = $(H_PIECES:%=$(srcdir)/../%.h) -SRCS=$(H_FILES) +SRCS = $(H_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + +all: preinstall + +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/inline/Makefile.in b/c/src/exec/score/inline/Makefile.in index 5b2a203a74..0210b0bc66 100644 --- a/c/src/exec/score/inline/Makefile.in +++ b/c/src/exec/score/inline/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/score/inline +top_builddir = ../.. +subdir = score/inline -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/inline/rtems/Makefile.in b/c/src/exec/score/inline/rtems/Makefile.in index 76e6134f17..520bce6a7c 100644 --- a/c/src/exec/score/inline/rtems/Makefile.in +++ b/c/src/exec/score/inline/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/inline/rtems +top_builddir = ../../.. +subdir = score/inline/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=score +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/inline/rtems/score/Makefile.in b/c/src/exec/score/inline/rtems/score/Makefile.in index d8214e9f7d..df86b07bb4 100644 --- a/c/src/exec/score/inline/rtems/score/Makefile.in +++ b/c/src/exec/score/inline/rtems/score/Makefile.in @@ -5,30 +5,36 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/inline/rtems/score +top_builddir = ../../../.. +subdir = score/inline/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # We only build multiprocessing related files if HAS_MP was defined -MP_PIECES_yes_V = mppkt objectmp threadmp -MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) +MP_I_PIECES_yes_V = mppkt objectmp threadmp +MP_I_PIECES = $(MP_I_PIECES_$(HAS_MP)_V) -I_PIECES= address chain coremsg coremutex coresem heap \ - isr object priority stack states sysstate thread \ - tod tqdata userext watchdog wkspace $(MP_PIECES) -I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) +I_PIECES = address chain coremsg coremutex coresem heap isr object priority \ + stack states sysstate thread tod tqdata userext watchdog wkspace \ + $(MP_I_PIECES) +I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) -SRCS=$(I_FILES) +SRCS = $(I_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -39,9 +45,11 @@ include $(RTEMS_ROOT)/make/lib.cfg CLEAN_ADDITIONS += $(LIB) CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall + +preinstall: $(INSTALLDIRS) $(I_FILES) + @$(INSTALL_CHANGE) -m 644 $(I_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/macros/Makefile.in b/c/src/exec/score/macros/Makefile.in index 796828cfed..a60ab196cd 100644 --- a/c/src/exec/score/macros/Makefile.in +++ b/c/src/exec/score/macros/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/score/macros +top_builddir = ../.. +subdir = score/macros -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/macros/rtems/Makefile.in b/c/src/exec/score/macros/rtems/Makefile.in index a4d99daa67..8a13cb6816 100644 --- a/c/src/exec/score/macros/rtems/Makefile.in +++ b/c/src/exec/score/macros/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/macros/rtems +top_builddir = ../../.. +subdir = score/macros/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=score +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/macros/rtems/score/Makefile.in b/c/src/exec/score/macros/rtems/score/Makefile.in index b8dba0da00..61969f5f43 100644 --- a/c/src/exec/score/macros/rtems/score/Makefile.in +++ b/c/src/exec/score/macros/rtems/score/Makefile.in @@ -5,30 +5,36 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/macros/rtems/score +top_builddir = ../../../.. +subdir = score/macros/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # We only build multiprocessing related files if HAS_MP was defined -MP_PIECES_yes_V = mppkt objectmp threadmp -MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) +MP_I_PIECES_yes_V = mppkt objectmp threadmp +MP_I_PIECES = $(MP_I_PIECES_$(HAS_MP)_V) -I_PIECES= address chain coremsg coremutex coresem heap \ - isr object priority stack states sysstate thread \ - tod tqdata userext watchdog wkspace $(MP_PIECES) -I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) +I_PIECES = address chain coremsg coremutex coresem heap isr object priority \ + stack states sysstate thread tod tqdata userext watchdog wkspace \ + $(MP_I_PIECES) +I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) -SRCS=$(I_FILES) +SRCS = $(I_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -39,9 +45,11 @@ include $(RTEMS_ROOT)/make/lib.cfg CLEAN_ADDITIONS += $(LIB) CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/score +preinstall: $(INSTALLDIRS) $(I_FILES) + @$(INSTALL_CHANGE) -m 644 $(I_FILES) $(PROJECT_INCLUDE)/rtems/score + +all: preinstall -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/src/Makefile.in b/c/src/exec/score/src/Makefile.in index fb238d0855..e7028aa3d6 100644 --- a/c/src/exec/score/src/Makefile.in +++ b/c/src/exec/score/src/Makefile.in @@ -5,51 +5,48 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/score/src +top_builddir = ../.. +subdir = score/src -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # We only build multiprocessing related files if HAS_MP was defined -MP_PIECES_yes_V = mpci objectmp threadmp -MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) +MP_C_PIECES_yes_V = mpci objectmp threadmp +MP_C_PIECES = $(MP_C_PIECES_$(HAS_MP)_V) -THREAD_PIECES=\ - thread threadchangepriority threadclearstate threadclose \ - threadcreateidle threaddelayended threaddispatch \ - threadevaluatemode threadget threadhandler \ - threadidlebody threadinitialize threadloadenv \ - threadready threadresettimeslice threadrestart \ - threadsetpriority threadsetstate threadsettransient \ - threadstackallocate threadstackfree threadstart \ - threadstartmultitasking threadtickletimeslice \ +THREAD_C_PIECES = thread threadchangepriority threadclearstate threadclose \ + threadcreateidle threaddelayended threaddispatch threadevaluatemode \ + threadget threadhandler threadidlebody threadinitialize threadloadenv \ + threadready threadresettimeslice threadrestart threadsetpriority \ + threadsetstate threadsettransient threadstackallocate threadstackfree \ + threadstart threadstartmultitasking threadtickletimeslice \ threadyieldprocessor # C and C++ source names, if any, go here -- minus the .c or .cc -C_PIECES=apiext chain coremsg coremutex coresem coretod heap interr \ - isr object $(THREAD_PIECES) threadq userext \ - watchdog wkspace $(MP_PIECES) -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = apiext chain coremsg coremutex coresem coretod heap interr isr \ + object $(THREAD_C_PIECES) threadq userext watchdog wkspace \ + $(MP_C_PIECES) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -SRCS=$(C_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # Add local stuff here using += # -DEFINES += -D__RTEMS_INSIDE__ +DEFINES += -D__RTEMS_INSIDE__ CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) # # Add your list of files to delete here. The config files @@ -58,11 +55,11 @@ CFLAGS += $(CFLAGS_OS_V) # 'make clobber' already includes 'make clean' # -CLEAN_ADDITIONS += +CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) ${OBJS} +all: ${ARCH} $(SRCS) ${OBJS} -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/wrapup/Makefile.in b/c/src/exec/wrapup/Makefile.in index 056ad7dd37..f8c26771fe 100644 --- a/c/src/exec/wrapup/Makefile.in +++ b/c/src/exec/wrapup/Makefile.in @@ -5,24 +5,24 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../.. -subdir = c/src/exec/wrapup +top_builddir = .. +subdir = wrapup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -POSIX_DIRS_yes_V=posix +INSTALL_CHANGE = @INSTALL_CHANGE@ + +POSIX_DIRS_yes_V = posix POSIX_DIRS = $(POSIX_DIRS_$(HAS_POSIX_API)_V) -SUB_DIRS=rtems $(POSIX_DIRS) +SUB_DIRS = rtems $(POSIX_DIRS) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/wrapup/posix/Makefile.in b/c/src/exec/wrapup/posix/Makefile.in index 049e14af53..2e01ab1419 100644 --- a/c/src/exec/wrapup/posix/Makefile.in +++ b/c/src/exec/wrapup/posix/Makefile.in @@ -5,12 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/wrapup/posix +top_builddir = ../.. +subdir = wrapup/posix -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ @@ -21,25 +19,27 @@ VPATH = @srcdir@ #CPU_OBJS=$(wildcard ../../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.rel) #CORE_OBJS=$(wildcard ../../score/src/$(ARCH)/*.o) #SAPI_OBJS=$(wildcard ../../sapi/src/$(ARCH)/*.o) -POSIX_OBJS=$(wildcard ../../posix/src/$(ARCH)/*.o) +POSIX_OBJS = $(wildcard ../../posix/src/$(ARCH)/*.o) -OBJS=$(CPU_OBJS) $(CORE_OBJS) $(POSIX_OBJS) $(SAPI_OBJS) -LIB=$(ARCH)/libposix.a +OBJS = $(CPU_OBJS) $(CORE_OBJS) $(POSIX_OBJS) $(SAPI_OBJS) +LIB = $(ARCH)/libposix.a -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -54,9 +54,9 @@ CLOBBER_ADDITIONS += $(LIB): ${OBJS} $(make-library) -all: ${ARCH} $(SRCS) $(LIB) - $(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(LIB) + $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/wrapup/rtems/Makefile.in b/c/src/exec/wrapup/rtems/Makefile.in index 290168f363..502bb85ced 100644 --- a/c/src/exec/wrapup/rtems/Makefile.in +++ b/c/src/exec/wrapup/rtems/Makefile.in @@ -5,38 +5,40 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/wrapup/rtems +top_builddir = ../.. +subdir = wrapup/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -CPU_OBJS=$(wildcard ../../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.rel) -CORE_OBJS=$(wildcard ../../score/src/$(ARCH)/*.o) -SAPI_OBJS=$(wildcard ../../sapi/src/$(ARCH)/*.o) -RTEMS_OBJS=$(wildcard ../../rtems/src/$(ARCH)/*.o) +CPU_OBJS = $(wildcard ../../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.rel) +CORE_OBJS = $(wildcard ../../score/src/$(ARCH)/*.o) +SAPI_OBJS = $(wildcard ../../sapi/src/$(ARCH)/*.o) +RTEMS_OBJS = $(wildcard ../../rtems/src/$(ARCH)/*.o) -OBJS=$(CPU_OBJS) $(CORE_OBJS) $(RTEMS_OBJS) $(SAPI_OBJS) -LIB=$(ARCH)/librtems.a +OBJS = $(CPU_OBJS) $(CORE_OBJS) $(RTEMS_OBJS) $(SAPI_OBJS) +LIB = $(ARCH)/librtems.a -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SIZE_RTEMS = $(SHELL) $(PROJECT_ROOT)/tools/cpu/generic/size_rtems + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -51,12 +53,12 @@ CLOBBER_ADDITIONS += $(LIB): ${OBJS} $(make-library) # cd $(PROJECT_ROOT) ; \ - $(SHELL) $(PROJECT_ROOT)/c/src/exec/score/tools/generic/size_rtems ${RTEMS_BSP} $(ARCH) \ + $(SIZE_RTEMS) @RTEMS_BSP@ $(ARCH) \ >$(PROJECT_RELEASE)/lib/sizeinfo$(LIB_VARIANT).txt -all: ${ARCH} $(SRCS) $(LIB) - $(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(LIB) + $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/Makefile.in b/c/src/lib/Makefile.in index 684cf772b7..40c56f567c 100644 --- a/c/src/lib/Makefile.in +++ b/c/src/lib/Makefile.in @@ -5,24 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = c/src/lib +top_builddir = . -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # We only build the networking library if HAS_NETWORKING was defined LIBNETWORKING_yes_V = libnetworking LIBNETWORKING = $(LIBNETWORKING_$(HAS_NETWORKING)_V) -NETWORKING_INCLUDE_yes_V = libnetworking/include -NETWORKING_INCLUDE = $(NETWORKING_INCLUDE_$(HAS_NETWORKING)_V) # We only build the rpc library if HAS_NETWORKING was defined LIBRPC_yes_V = librpc @@ -37,17 +34,13 @@ LIBRTEMSCPLUSPLUS_yes_V = librtems++ LIBRTEMSCPLUSPLUS = $(LIBRTEMSCPLUSPLUS_$(HAS_CPLUSPLUS)_V) # General Hardware API library -LIBHWAPI=$(wildcard libhwapi) +LIBHWAPI = $(wildcard libhwapi) -ifneq ($(RTEMS_CPU),unix) -LIBCHIP=libchip -endif +@UNIX_FALSE@LIBCHIP = libchip -SUB_DIRS=start include $(NETWORKING_INCLUDE) libmisc \ - libc $(LIBCHIP) libcpu libbsp \ - $(LIBNETWORKING) $(LIBRPC) $(LIBRDBG) \ - $(LIBHWAPI) $(LIBRTEMSCPLUSPLUS) wrapup +SUB_DIRS = start include libmisc libc $(LIBNETWORKING) libcpu libbsp \ + $(LIBRPC) $(LIBRDBG) $(LIBCHIP) $(LIBHWAPI) $(LIBRTEMSCPLUSPLUS) wrapup -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/include/Makefile.in b/c/src/lib/include/Makefile.in index bd11d7a246..d2869a662b 100644 --- a/c/src/lib/include/Makefile.in +++ b/c/src/lib/include/Makefile.in @@ -5,68 +5,90 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../.. -subdir = c/src/lib/include +top_builddir = .. +subdir = include -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(RTEMS_ROOT)/make/leaf.cfg + +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/sys $(PROJECT_INCLUDE)/motorola \ + $(PROJECT_INCLUDE)/zilog $(LIBRPCdir) $(LIBRDBGdir) \ + $(LIBRTEMSCPLUSPLUSdir) $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems++ \ + $(PROJECT_INCLUDE)/rpc $(PROJECT_INCLUDE)/rdbg + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + VPATH = @srcdir@ -H_PIECES=chain console clockdrv iosupp ringbuf \ - spurious timerdrv vmeintr -H_FILES=$(H_PIECES:%=$(srcdir)/%.h) +H_PIECES = chain console clockdrv iosupp ringbuf spurious timerdrv vmeintr +H_FILES = $(H_PIECES:%=$(srcdir)/%.h) -SYS_H_PIECES=termios utime -ifeq ($(HAS_NETWORKING),no) -SYS_H_PIECES+=ioctl -endif -SYS_H_FILES=$(SYS_H_PIECES:%=$(srcdir)/sys/%.h) +SYS_H_PIECES_no_V = ioctl +SYS_H_PIECES_yes_V = +SYS_H_PIECES = termios utime $(SYS_H_PIECES_$(HAS_NETWORKING)_V) +SYS_H_FILES = $(SYS_H_PIECES:%=$(srcdir)/sys/%.h) -MOTOROLA_H_PIECES=mc68230 mc68681 -MOTOROLA_H_FILES=$(MOTOROLA_H_PIECES:%=$(srcdir)/motorola/%.h) +MOTOROLA_H_PIECES = mc68230 mc68681 +MOTOROLA_H_FILES = $(MOTOROLA_H_PIECES:%=$(srcdir)/motorola/%.h) -ZILOG_H_PIECES=z8036 z8530 z8536 -ZILOG_H_FILES=$(ZILOG_H_PIECES:%=$(srcdir)/zilog/%.h) +ZILOG_H_PIECES = z8036 z8530 z8536 +ZILOG_H_FILES = $(ZILOG_H_PIECES:%=$(srcdir)/zilog/%.h) -RTEMSCPLUSPLUS_H_PIECES= rtemsEvent rtemsInterrupt rtemsMessageQueue \ - rtemsSemaphore rtemsStatusCode rtemsTask rtemsTaskMode rtemsTimer -RTEMSCPLUSPLUS_H_FILES=$(RTEMSCPLUSPLUS_H_PIECES:%=$(srcdir)/rtems++/%.h) +RTEMSCPLUSPLUS_H_PIECES_yes_V = rtemsEvent rtemsInterrupt rtemsMessageQueue \ + rtemsSemaphore rtemsStatusCode rtemsTask rtemsTaskMode rtemsTimer +RTEMSCPLUSPLUS_H_PIECES = $(RTEMSCPLUSPLUS_H_PIECES_$(HAS_CPLUSPLUS)_V) +RTEMSCPLUSPLUS_H_FILES = $(RTEMSCPLUSPLUS_H_PIECES:%=$(srcdir)/rtems++/%.h) -RPC_H_PIECES= auth clnt rpc rpc_msg svc svc_auth types xdr -RPC_H_FILES=$(RPC_H_PIECES:%=$(srcdir)/rpc/%.h) +RPC_H_PIECES = auth clnt rpc rpc_msg svc svc_auth types xdr +RPC_H_FILES = $(RPC_H_PIECES:%=$(srcdir)/rpc/%.h) # We only build the rdbg library if HAS_NETWORKING and HAS_RDBG was defined RDBG_H_PIECES_yes_yes_V = servrpc rdbg $(RTEMS_CPU)/rdbg_f $(RTEMS_CPU)/reg -RDBG_H_FILES=$(RDBG_H_PIECES_$(HAS_NETWORKING)_$(HAS_RDBG)_V:%=$(srcdir)/rdbg/%.h) +RDBG_H_PIECES = $(RDBG_H_PIECES_$(HAS_NETWORKING)_$(HAS_RDBG)_V) +RDBG_H_FILES = $(RDBG_H_PIECES:%=$(srcdir)/rdbg/%.h) -SRCS=$(H_FILES) $(SYS_H_FILES) \ - $(MOTOROLA_H_FILES) $(RTEMSCPLUSPLUS_H_FILES) \ - $(RPC_H_FILES) $(RDBG_H_FILES) +SRCS = $(H_FILES) $(SYS_H_FILES) $(MOTOROLA_H_FILES) \ + $(RTEMSCPLUSPLUS_H_FILES) $(RPC_H_FILES) $(RDBG_H_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg -include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) - $(INSTALL_CHANGE) -m 444 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys - $(INSTALL_CHANGE) -m 444 $(MOTOROLA_H_FILES) \ - $(PROJECT_INCLUDE)/motorola - $(INSTALL_CHANGE) -m 444 $(ZILOG_H_FILES) $(PROJECT_INCLUDE)/zilog -ifeq ($(HAS_CPLUSPLUS),yes) - $(INSTALL_CHANGE) -m 444 $(RTEMSCPLUSPLUS_H_FILES) $(PROJECT_INCLUDE)/rtems++ -endif -ifeq ($(HAS_NETWORKING),yes) - $(INSTALL_CHANGE) -m 444 $(RPC_H_FILES) $(PROJECT_INCLUDE)/rpc -ifeq ($(HAS_RDBG),yes) - $(INSTALL_CHANGE) -m 444 $(RDBG_H_FILES) $(PROJECT_INCLUDE)/rdbg -endif -endif - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +# We only make the rpc install point if networking is enabled. +LIBRPC_yes_V = $(PROJECT_INCLUDE)/rpc +LIBRPCdir = $(LIBRPC_$(HAS_NETWORKING)_V) + +# We only make the rdbg install point if networking and rdbg is enabled. +LIBRDBG_yes_yes_V = $(PROJECT_INCLUDE)/rdbg +LIBRDBGdir = $(LIBRDBG_$(HAS_NETWORKING)_$(HAS_RDBG)_V) + +# We only make the rtems++ install point if it is enabled. +LIBRTEMSCPLUSPLUS_yes_V = $(PROJECT_INCLUDE)/rtems++ +LIBRTEMSCPLUSPLUSdir = $(LIBRTEMSCPLUSPLUS_$(HAS_CPLUSPLUS)_V) + +all: preinstall + +preinstall: $(INSTALLDIRS) $(SRCS) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys + @$(INSTALL_CHANGE) -m 644 $(MOTOROLA_H_FILES) $(PROJECT_INCLUDE)/motorola + @$(INSTALL_CHANGE) -m 644 $(ZILOG_H_FILES) $(PROJECT_INCLUDE)/zilog + @if test "$(HAS_CPLUSPLUS)" = "yes"; then \ + $(INSTALL_CHANGE) -m 644 $(RTEMSCPLUSPLUS_H_FILES) $(PROJECT_INCLUDE)/rtems++; \ + fi + @if test "$(HAS_NETWORKING)" = "yes"; then \ + $(INSTALL_CHANGE) -m 644 $(RPC_H_FILES) $(PROJECT_INCLUDE)/rpc; \ + fi + @if test "$(HAS_RDBG)" = "yes"; then \ + $(INSTALL_CHANGE) -m 644 $(RDBG_H_FILES) $(PROJECT_INCLUDE)/rdbg; \ + fi + +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/Makefile.in b/c/src/lib/libbsp/Makefile.in index 512a47fbe4..3c16f731b0 100644 --- a/c/src/lib/libbsp/Makefile.in +++ b/c/src/lib/libbsp/Makefile.in @@ -5,25 +5,31 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../.. -subdir = c/src/lib/libbsp +top_builddir = .. +subdir = libbsp -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_ROOT)/@RTEMS_BSP@/lib + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # shmdr is a portable shared memory MPCI layer # We only build it if HAS_MP was defined MP_DRIVERS_yes_V = shmdr MP_DRIVERS = $(MP_DRIVERS_$(HAS_MP)_V) -SUB_DIRS=$(MP_DRIVERS) +SUB_DIRS = $(MP_DRIVERS) # If we are building a "real" BSP, then we need to descend into the # appropriate CPU specific directory. The bare BSP is a special @@ -31,24 +37,20 @@ SUB_DIRS=$(MP_DRIVERS) # level as the CPUs. If we are building the bare BSP, then descend # into that directory. -ifeq (${RTEMS_BSP},bare) -SUB_DIRS += bare -else -SUB_DIRS += $(wildcard $(RTEMS_CPU)) -endif +SUB_DIRS += @RTEMS_LIBBSP_CPU_SUBDIR@ -preinstall: - $(RTEMS_ROOT)/mkinstalldirs $(PROJECT_ROOT)/${RTEMS_BSP}/lib - if test "${RTEMS_BSP}" = "bare"; then \ - $(INSTALL_DATA) \ +preinstall: + @$(mkinstalldirs) $(PROJECT_ROOT)/@RTEMS_BSP@/lib + @if test "@RTEMS_BSP@" = "bare"; then \ + $(INSTALL_CHANGE) -m 644 \ $(srcdir)/bare/bsp_specs \ - $(PROJECT_ROOT)/${RTEMS_BSP}/lib; \ + $(PROJECT_ROOT)/@RTEMS_BSP@/lib; \ else \ - $(INSTALL_DATA) \ + $(INSTALL_CHANGE) -m 644 \ $(srcdir)/$(RTEMS_CPU)/${RTEMS_BSP_FAMILY}/bsp_specs \ - $(PROJECT_ROOT)/${RTEMS_BSP}/lib; \ + $(PROJECT_ROOT)/@RTEMS_BSP@/lib; \ fi -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/a29k/Makefile.in b/c/src/lib/libbsp/a29k/Makefile.in index eab4ac4768..17a56d092a 100644 --- a/c/src/lib/libbsp/a29k/Makefile.in +++ b/c/src/lib/libbsp/a29k/Makefile.in @@ -5,22 +5,22 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/lib/libbsp/a29k +top_builddir = ../.. +subdir = libbsp/a29k -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # Descend into the $(RTEMS_BSP_FAMILY) directory -SUB_DIRS=$(RTEMS_BSP_FAMILY) +SUB_DIRS = $(RTEMS_BSP_FAMILY) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/a29k/portsw/Makefile.in b/c/src/lib/libbsp/a29k/portsw/Makefile.in index 9dc2463cb0..6d3328ed49 100644 --- a/c/src/lib/libbsp/a29k/portsw/Makefile.in +++ b/c/src/lib/libbsp/a29k/portsw/Makefile.in @@ -5,27 +5,27 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/lib/libbsp/a29k/portsw +top_builddir = ../../.. +subdir = libbsp/a29k/portsw -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SRCS=README +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SRCS = README all: $(SRCS) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS=include startup console wrapup +SUB_DIRS = include startup console wrapup -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/a29k/portsw/console/Makefile.in b/c/src/lib/libbsp/a29k/portsw/console/Makefile.in index 6a715d2b3b..3288995f4d 100644 --- a/c/src/lib/libbsp/a29k/portsw/console/Makefile.in +++ b/c/src/lib/libbsp/a29k/portsw/console/Makefile.in @@ -5,47 +5,53 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/a29k/portsw/console +top_builddir = ../../../.. +subdir = libbsp/a29k/portsw/console -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/console.rel +PGM = ${ARCH}/console.rel # C source names, if any, go here -- minus the .c -C_PIECES=console serial -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = console serial +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES=$(srcdir)/concntl.h +H_FILES = $(srcdir)/concntl.h # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -60,11 +66,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) - $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) +all: ${ARCH} $(SRCS) $(PGM) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/a29k/portsw/include/Makefile.in b/c/src/lib/libbsp/a29k/portsw/include/Makefile.in index feb0934b4e..fa2c65a533 100644 --- a/c/src/lib/libbsp/a29k/portsw/include/Makefile.in +++ b/c/src/lib/libbsp/a29k/portsw/include/Makefile.in @@ -5,12 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/a29k/portsw/include +top_builddir = ../../../.. +subdir = libbsp/a29k/portsw/include -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ @@ -27,18 +25,26 @@ H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h EQ_FILES = -SRCS=$(H_FILES) $(EQ_FILES) +SRCS = $(H_FILES) $(EQ_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) - $(INSTALL_CHANGE) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE) +all: $(SRCS) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(EQ_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/a29k/portsw/shmsupp/Makefile.in b/c/src/lib/libbsp/a29k/portsw/shmsupp/Makefile.in index 90a0b4bc65..46774cbed2 100644 --- a/c/src/lib/libbsp/a29k/portsw/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/a29k/portsw/shmsupp/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/a29k/portsw/shmsupp +top_builddir = ../../../.. +subdir = libbsp/a29k/portsw/shmsupp -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/shmsupp.rel +PGM = ${ARCH}/shmsupp.rel # C source names, if any, go here -- minus the .c -C_PIECES=addrconv getcfg lock mpisr -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = addrconv getcfg lock mpisr +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -60,11 +60,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/a29k/portsw/start/Makefile.in b/c/src/lib/libbsp/a29k/portsw/start/Makefile.in index ca133736db..f36df5138a 100644 --- a/c/src/lib/libbsp/a29k/portsw/start/Makefile.in +++ b/c/src/lib/libbsp/a29k/portsw/start/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/lib/start/a29k +top_builddir = ../.. +subdir = start/a29k -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES=crt0 register -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = crt0 register +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg -PGM=${ARCH}/crt0.o ${ARCH}/register.o +INSTALL_CHANGE = @INSTALL_CHANGE@ + +PGM = ${ARCH}/crt0.o ${ARCH}/register.o # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -57,9 +57,9 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) $(OBJS) $(PGM) - $(INSTALL_VARIANT) -m 555 ${PGM} ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(OBJS) $(PGM) + $(INSTALL_VARIANT) -m 755 ${PGM} $(PROJECT_RELEASE)/lib -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/a29k/portsw/startup/Makefile.in b/c/src/lib/libbsp/a29k/portsw/startup/Makefile.in index 4f1d02816e..60d940a45a 100644 --- a/c/src/lib/libbsp/a29k/portsw/startup/Makefile.in +++ b/c/src/lib/libbsp/a29k/portsw/startup/Makefile.in @@ -5,47 +5,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/a29k/portsw/startup +top_builddir = ../../../.. +subdir = libbsp/a29k/portsw/startup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@:@srcdir@/../../../shared -PGM=${ARCH}/startup.rel +PGM = ${ARCH}/startup.rel # C source names, if any, go here -- minus the .c -C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = bspclean bsplibc bsppost bspstart bootcard main sbrk setvec \ + gnatinstallhandler +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=ramlink romlink $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = ramlink romlink $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_RELEASE)/lib + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -60,11 +67,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) - $(INSTALL_CHANGE) ramlink romlink ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(PGM) + $(INSTALL_CHANGE) ramlink romlink $(PROJECT_RELEASE)/lib # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in b/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in index b2b6769f4b..7544169d89 100644 --- a/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in +++ b/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in @@ -5,40 +5,41 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/a29k/portsw/wrapup +top_builddir = ../../../.. +subdir = libbsp/a29k/portsw/wrapup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -BSP_PIECES=startup console iic ethernet flash nvram -CPU_PIECES=clock timer -GENERIC_PIECES= +BSP_PIECES = startup console iic ethernet flash nvram +CPU_PIECES = clock timer +GENERIC_PIECES = # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS=$(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) \ - $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) -LIB=$(ARCH)/libbsp.a +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ + $(foreach piece, $(CPU_PIECES), \ + ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) $(foreach \ + piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) +LIB = $(ARCH)/libbsp.a -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -53,9 +54,9 @@ CLOBBER_ADDITIONS += $(LIB): ${OBJS} $(make-library) -all: ${ARCH} $(SRCS) $(LIB) - $(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(LIB) + $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/bare/Makefile.in b/c/src/lib/libbsp/bare/Makefile.in index fa5bcabc7b..987f24c6a7 100644 --- a/c/src/lib/libbsp/bare/Makefile.in +++ b/c/src/lib/libbsp/bare/Makefile.in @@ -5,27 +5,27 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/lib/libbsp/bare +top_builddir = ../.. +subdir = libbsp/bare -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SRCS=README +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SRCS = README all: $(SRCS) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS=include wrapup +SUB_DIRS = include wrapup -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/bare/include/Makefile.in b/c/src/lib/libbsp/bare/include/Makefile.in index 49acc822a8..659af1cd14 100644 --- a/c/src/lib/libbsp/bare/include/Makefile.in +++ b/c/src/lib/libbsp/bare/include/Makefile.in @@ -5,12 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/lib/libbsp/bare/include +top_builddir = ../../.. +subdir = libbsp/bare/include -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ @@ -27,19 +25,27 @@ H_FILES = $(srcdir)/bsp.h EQ_FILES = -SRCS=$(H_FILES) $(EQ_FILES) +SRCS = $(H_FILES) $(EQ_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: preinstall +all: preinstall preinstall: $(SRCS) - $(INSTALL_CHANGE) $(INSTINCFLAGS) $(H_FILES) $(PROJECT_INCLUDE) + $(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/bare/wrapup/Makefile.in b/c/src/lib/libbsp/bare/wrapup/Makefile.in index cea596f763..07b9a6109e 100644 --- a/c/src/lib/libbsp/bare/wrapup/Makefile.in +++ b/c/src/lib/libbsp/bare/wrapup/Makefile.in @@ -5,38 +5,40 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/lib/libbsp/bare/wrapup +top_builddir = ../../.. +subdir = libbsp/bare/wrapup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -BSP_PIECES= -GENERIC_PIECES= +BSP_PIECES = +GENERIC_PIECES = # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ - $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) -LIB=$(ARCH)/libbsp.a +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ + $(foreach piece, $(GENERIC_PIECES), \ + ../../../$(piece)/$(ARCH)/$(piece).rel) +LIB = $(ARCH)/libbsp.a -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL = @INSTALL@ +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -51,12 +53,12 @@ CLOBBER_ADDITIONS += $(LIB): ${OBJS} $(make-library) -all: ${ARCH} $(SRCS) $(LIB) - $(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(LIB) + $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib -$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs +$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs $(INSTALL_DATA) $< $@ -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/hppa1.1/Makefile.in b/c/src/lib/libbsp/hppa1.1/Makefile.in index 68c642fdc5..a855f8f743 100644 --- a/c/src/lib/libbsp/hppa1.1/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/Makefile.in @@ -5,22 +5,22 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/lib/libbsp/hppa1.1 +top_builddir = ../.. +subdir = libbsp/hppa1.1 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # Descend into the $(RTEMS_BSP_FAMILY) directory -SUB_DIRS=$(RTEMS_BSP_FAMILY) +SUB_DIRS = $(RTEMS_BSP_FAMILY) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in b/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in index 49168b1d7c..f074505551 100644 --- a/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in @@ -11,29 +11,35 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/lib/libbsp/hppa1.1/pxfl +top_builddir = ../../.. +subdir = libbsp/hppa1.1/pxfl -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg -SRCS=$(srcdir)/floss-bsp.h +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/bsp.h + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + +SRCS = $(srcdir)/floss-bsp.h # HACK alert # on a 'make -k' we don't want to bomb out of build -EXIT_CMD=exit 1 +EXIT_CMD = true ifeq (k, $(findstring k, $(MAKEFLAGS))) -EXIT_CMD=true -endif +EXIT_CMD = true +endif -all install:: +all install: @$(ECHO); $(ECHO) @if [ ! -d $(FLOSS_ROOT) ]; \ then \ @@ -53,8 +59,8 @@ all install:: eval $$cmd || $(EXIT_CMD); \ fi @$(ECHO); $(ECHO) - $(INSTALL_CHANGE) -m 444 $(srcdir)/floss-bsp.h $(PROJECT_INCLUDE)/bsp.h + @$(INSTALL_CHANGE) -m 644 $(srcdir)/floss-bsp.h $(PROJECT_INCLUDE)/bsp.h -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in index dcec4638b3..a7b6594bff 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in @@ -5,19 +5,19 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/lib/libbsp/hppa1.1/simhppa +top_builddir = ../../.. +subdir = libbsp/hppa1.1/simhppa -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # We only build the multiprocessing support if HAS_MP was defined MP_SUPPORT_yes_V = shmsupp MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V) @@ -25,8 +25,8 @@ MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories # NOTE: we pick up HPPA clock and timer from libcpu/hppa -SUB_DIRS=tools include start startup tty $(MP_SUPPORT) wrapup +SUB_DIRS = tools include start startup tty $(MP_SUPPORT) wrapup -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in index 01503f0dd5..874c42f730 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in @@ -5,21 +5,19 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/hppa1.1/simhppa/include +top_builddir = ../../../.. +subdir = libbsp/hppa1.1/simhppa/include -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ H_PIECES = bsp coverhd -H_FILES=$(H_PIECES:%=$(srcdir)/%.h) +H_FILES = $(H_PIECES:%=$(srcdir)/%.h) RTEMS_H_PIECES = ttydrv -RTEMS_H_FILES=$(RTEMS_H_PIECES:%=$(srcdir)/%.h) +RTEMS_H_FILES = $(RTEMS_H_PIECES:%=$(srcdir)/%.h) # # Equate files are for including from assembly preprocessed by @@ -34,18 +32,26 @@ RTEMS_H_FILES=$(RTEMS_H_PIECES:%=$(srcdir)/%.h) EQ_FILES = -SRCS=$(H_FILES) $(EQ_FILES) +SRCS = $(H_FILES) $(EQ_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) - $(INSTALL_CHANGE) -m 444 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/rtems +all: $(SRCS) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in index 496f5b3511..3c4cbb6965 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in @@ -5,42 +5,42 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/hppa1.1/simhppa/shmsupp +top_builddir = ../../../.. +subdir = libbsp/hppa1.1/simhppa/shmsupp -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/shmsupp.rel +PGM = ${ARCH}/shmsupp.rel # C source names, if any, go here -- minus the .c -C_PIECES=addrconv getcfg intr lock mpisr -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = addrconv getcfg intr lock mpisr +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -55,11 +55,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in index 0a3bf2c98c..133009ce20 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/hppa1.1/simhppa/start +top_builddir = ../../../.. +subdir = libbsp/hppa1.1/simhppa/start -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGMS=${ARCH}/start.o +PGMS = ${ARCH}/start.o # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES=start -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = start +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -57,9 +57,9 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) $(OBJS) $(PGM) - $(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(OBJS) $(PGM) + $(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in index 0f9ed7ac3b..80d82870b0 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in @@ -5,42 +5,43 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/hppa1.1/simhppa/startup +top_builddir = ../../../.. +subdir = libbsp/hppa1.1/simhppa/startup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@:@srcdir@/../../../shared -PGM=${ARCH}/startup.rel +PGM = ${ARCH}/startup.rel # C source names, if any, go here -- minus the .c -C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = bspclean bsplibc bsppost bspstart bootcard main sbrk setvec \ + gnatinstallhandler +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -55,10 +56,10 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.am index cfe75e1034..1eb04d75c2 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.am +++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.am @@ -2,8 +2,8 @@ # $Id$ # -AUTOMAKE_OPTIONS = foreign -ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal noinst_PROGRAMS= \ print_dump @@ -12,8 +12,8 @@ print_dump_SOURCES= \ print_dump.c # HACK: install to build-tree -install-exec-local: print_dump - $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/bin - $(INSTALL_PROGRAM) print_dump $(PROJECT_ROOT)/${RTEMS_BSP}/bin +install-exec-local: $(PROGRAMS) + $(mkinstalldirs) $(PROJECT_ROOT)/simhppa/bin + $(INSTALL_PROGRAM) print_dump $(PROJECT_ROOT)/simhppa/bin include $(top_srcdir)/../../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in index 1d714519b2..d84b80e387 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in @@ -44,6 +44,8 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . + +ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ @@ -67,16 +69,25 @@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ CC = @CC@ +INSTALL_CHANGE = @INSTALL_CHANGE@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ +PACKHEX = @PACKHEX@ PROJECT_ROOT = @PROJECT_ROOT@ RTEMS_CPU = @RTEMS_CPU@ RTEMS_ROOT = @RTEMS_ROOT@ RTEMS_TOPdir = @RTEMS_TOPdir@ VERSION = @VERSION@ +project_bindir = @project_bindir@ +project_includedir = @project_includedir@ +project_libdir = @project_libdir@ +rtems_bspdir = @rtems_bspdir@ +rtems_makedir = @rtems_makedir@ +tooldir = @tooldir@ -AUTOMAKE_OPTIONS = foreign -ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal noinst_PROGRAMS = print_dump @@ -117,19 +128,19 @@ OBJECTS = $(print_dump_OBJECTS) all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../../../../../automake/local.am +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../../../../../automake/local.am cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(ACLOCAL_M4): configure.in - cd $(srcdir) && $(ACLOCAL) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) config.h: stamp-h @@ -142,7 +153,7 @@ stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status && CONFIG_FILES= CONFIG_HEADERS=config.h \ $(SHELL) ./config.status @echo timestamp > stamp-h 2> /dev/null -$(srcdir)/config.h.in: $(srcdir)/stamp-h.in +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in @if test ! -f $@; then \ rm -f $(srcdir)/stamp-h.in; \ $(MAKE) $(srcdir)/stamp-h.in; \ @@ -386,9 +397,9 @@ maintainer-clean # HACK: install to build-tree -install-exec-local: print_dump - $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/bin - $(INSTALL_PROGRAM) print_dump $(PROJECT_ROOT)/${RTEMS_BSP}/bin +install-exec-local: $(PROGRAMS) + $(mkinstalldirs) $(PROJECT_ROOT)/simhppa/bin + $(INSTALL_PROGRAM) print_dump $(PROJECT_ROOT)/simhppa/bin debug-am: debug: debug-am diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/aclocal.m4 b/c/src/lib/libbsp/hppa1.1/simhppa/tools/aclocal.m4 index 38d17a9a4d..606551036d 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/aclocal.m4 +++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/aclocal.m4 @@ -27,10 +27,6 @@ TARGET_SUBDIR=".") RTEMS_TOPdir="$1"; AC_SUBST(RTEMS_TOPdir) -PROJECT_ROOT=`pwd`/$RTEMS_TOPdir; -test "$TARGET_SUBDIR" = "." || PROJECT_ROOT="$PROJECT_ROOT/.." -AC_SUBST(PROJECT_ROOT) - dnl Determine RTEMS Version string from the VERSION file dnl Hopefully, Joel never changes its format ;- AC_MSG_CHECKING([for RTEMS Version]) @@ -46,9 +42,6 @@ if test -z "$RTEMS_VERSION"; then AC_MSG_ERROR(Unable to determine version) fi AC_MSG_RESULT($RTEMS_VERSION) - -RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir; -AC_SUBST(RTEMS_ROOT) ])dnl dnl @@ -184,6 +177,39 @@ else fi AC_SUBST($1)]) +# Add --enable-maintainer-mode option to configure. +# From Jim Meyering + +# serial 1 + +AC_DEFUN(AM_MAINTAINER_MODE, +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT($USE_MAINTAINER_MODE) + AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +# Define a conditional. + +AC_DEFUN(AM_CONDITIONAL, +[AC_SUBST($1_TRUE) +AC_SUBST($1_FALSE) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi]) + # Like AC_CONFIG_HEADER, but automatically create stamp file. AC_DEFUN(AM_CONFIG_HEADER, @@ -207,3 +233,52 @@ for am_file in <<$1>>; do done<<>>dnl>>) changequote([,]))]) +dnl +dnl $Id$ +dnl + +AC_DEFUN(RTEMS_PROJECT_ROOT, +[dnl +AC_REQUIRE([RTEMS_TOP]) +if test "$TARGET_SUBDIR" = "." ; then +PROJECT_ROOT=$RTEMS_TOPdir/'$(top_builddir)'; +else +PROJECT_ROOT=../$RTEMS_TOPdir/'$(top_builddir)' +fi +AC_SUBST(PROJECT_ROOT) + +RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP +AC_SUBST(RTEMS_ROOT) + +INSTALL_CHANGE="\$(KSH) \$(PROJECT_ROOT)/tools/build/install-if-change" +AC_SUBST(INSTALL_CHANGE) + +PACKHEX="\$(PROJECT_ROOT)/tools/build/packhex" +AC_SUBST(PACKHEX) +]) + + +AC_DEFUN(RTEMS_TOOLPATHS, +[ +# tooldir='$(exec_prefix)/'$target_alias +# Temporary work-around until building in source tree is supported +AC_REQUIRE([RTEMS_PROJECT_ROOT]) + +tooldir='$(PROJECT_ROOT)' +AC_SUBST(tooldir) + +project_includedir='$(tooldir)'/include +AC_SUBST(project_includedir) + +project_libdir='$(tooldir)/lib$(MULTISUBDIR)' +AC_SUBST(project_libdir) + +project_bindir='$(tooldir)/bin' +AC_SUBST(project_bindir) + +rtems_bspdir='$(prefix)/${RTEMS_BSP}' +AC_SUBST(rtems_bspdir) +rtems_makedir='$(prefix)/make' +AC_SUBST(rtems_makedir) +]) + diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure b/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure index f2ddc29103..868d8e117b 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure +++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure @@ -13,6 +13,9 @@ ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help --with-target-subdir=DIR" +ac_help="$ac_help + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -555,12 +558,8 @@ fi RTEMS_TOPdir="../../../../../../.."; -PROJECT_ROOT=`pwd`/$RTEMS_TOPdir; -test "$TARGET_SUBDIR" = "." || PROJECT_ROOT="$PROJECT_ROOT/.." - - echo $ac_n "checking for RTEMS Version""... $ac_c" 1>&6 -echo "configure:564: checking for RTEMS Version" >&5 +echo "configure:563: checking for RTEMS Version" >&5 if test -r "${srcdir}/${RTEMS_TOPdir}/VERSION"; then RTEMS_VERSION=`grep Version ${srcdir}/${RTEMS_TOPdir}/VERSION | \ sed -e 's%RTEMS[ ]*Version[ ]*\(.*\)[ ]*%\1%g'` @@ -572,9 +571,6 @@ if test -z "$RTEMS_VERSION"; then fi echo "$ac_t""$RTEMS_VERSION" 1>&6 -RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir; - - # Do some error checking and defaulting for the host and target type. @@ -604,7 +600,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:608: checking host system type" >&5 +echo "configure:604: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -625,7 +621,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:629: checking target system type" >&5 +echo "configure:625: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -643,7 +639,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:647: checking build system type" >&5 +echo "configure:643: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -666,7 +662,7 @@ test "$host_alias" != "$target_alias" && program_prefix=${target_alias}- echo $ac_n "checking rtems target cpu""... $ac_c" 1>&6 -echo "configure:670: checking rtems target cpu" >&5 +echo "configure:666: checking rtems target cpu" >&5 case "${target}" in # hpux unix port should go here i[3456]86-go32-rtems*) @@ -704,7 +700,7 @@ echo "$ac_t""$RTEMS_CPU" 1>&6 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:708: checking for a BSD compatible install" >&5 +echo "configure:704: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -757,7 +753,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:761: checking whether build environment is sane" >&5 +echo "configure:757: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -814,7 +810,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:818: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:814: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -853,7 +849,7 @@ fi missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:857: checking for working aclocal" >&5 +echo "configure:853: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -866,7 +862,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:870: checking for working autoconf" >&5 +echo "configure:866: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -879,7 +875,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:883: checking for working automake" >&5 +echo "configure:879: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -892,7 +888,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:896: checking for working autoheader" >&5 +echo "configure:892: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -905,7 +901,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:909: checking for working makeinfo" >&5 +echo "configure:905: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -918,11 +914,34 @@ else fi +echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 +echo "configure:919: checking whether to enable maintainer-specific portions of Makefiles" >&5 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval="$enable_maintainer_mode" + USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 + + +if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + MAINT=$MAINTAINER_MODE_TRUE + + # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:926: checking for $ac_word" >&5 +echo "configure:945: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -952,7 +971,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:956: checking for $ac_word" >&5 +echo "configure:975: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1003,7 +1022,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1007: checking for $ac_word" >&5 +echo "configure:1026: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1035,7 +1054,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1039: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1058: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1046,12 +1065,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1050 "configure" +#line 1069 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1077,12 +1096,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1081: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1100: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1086: checking whether we are using GNU C" >&5 +echo "configure:1105: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1091,7 +1110,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1114: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1110,7 +1129,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1114: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1133: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1145,12 +1164,12 @@ fi for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1149: checking for $ac_func" >&5 +echo "configure:1168: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1154 "configure" +#line 1173 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1173,7 +1192,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1201,6 +1220,46 @@ done + +if test "$TARGET_SUBDIR" = "." ; then +PROJECT_ROOT=$RTEMS_TOPdir/'$(top_builddir)'; +else +PROJECT_ROOT=../$RTEMS_TOPdir/'$(top_builddir)' +fi + + +RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP + + +INSTALL_CHANGE="\$(KSH) \$(PROJECT_ROOT)/tools/build/install-if-change" + + +PACKHEX="\$(PROJECT_ROOT)/tools/build/packhex" + + + +# tooldir='$(exec_prefix)/'$target_alias +# Temporary work-around until building in source tree is supported + + +tooldir='$(PROJECT_ROOT)' + + +project_includedir='$(tooldir)'/include + + +project_libdir='$(tooldir)/lib$(MULTISUBDIR)' + + +project_bindir='$(tooldir)/bin' + + +rtems_bspdir='$(prefix)/${RTEMS_BSP}' + +rtems_makedir='$(prefix)/make' + + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1335,8 +1394,6 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@RTEMS_TOPdir@%$RTEMS_TOPdir%g -s%@PROJECT_ROOT@%$PROJECT_ROOT%g -s%@RTEMS_ROOT@%$RTEMS_ROOT%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g @@ -1364,7 +1421,20 @@ s%@AUTOMAKE@%$AUTOMAKE%g s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g s%@SET_MAKE@%$SET_MAKE%g +s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g +s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g +s%@MAINT@%$MAINT%g s%@CC@%$CC%g +s%@PROJECT_ROOT@%$PROJECT_ROOT%g +s%@RTEMS_ROOT@%$RTEMS_ROOT%g +s%@INSTALL_CHANGE@%$INSTALL_CHANGE%g +s%@PACKHEX@%$PACKHEX%g +s%@tooldir@%$tooldir%g +s%@project_includedir@%$project_includedir%g +s%@project_libdir@%$project_libdir%g +s%@project_bindir@%$project_bindir%g +s%@rtems_bspdir@%$rtems_bspdir%g +s%@rtems_makedir@%$rtems_makedir%g CEOF EOF diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in b/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in index c7bfe82215..02339d79b1 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in @@ -9,11 +9,15 @@ RTEMS_TOP(../../../../../../..) RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-lib-libbsp-hppa-simhppa-tools,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE AC_PROG_CC AC_CHECK_FUNCS(strerror) AM_CONFIG_HEADER(config.h) +RTEMS_PROJECT_ROOT +RTEMS_TOOLPATHS + AC_OUTPUT( Makefile) diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in index d8a3422fc8..21dc3fbb99 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in @@ -5,42 +5,42 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/hppa1.1/simhppa/tty +top_builddir = ../../../.. +subdir = libbsp/hppa1.1/simhppa/tty -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/tty.rel +PGM = ${ARCH}/tty.rel # C source names, if any, go here -- minus the .c -C_PIECES=tty -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = tty +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -55,11 +55,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in index 6d20be895d..4532e34135 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in @@ -5,48 +5,51 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/hppa1.1/simhppa/wrapup +top_builddir = ../../../.. +subdir = libbsp/hppa1.1/simhppa/wrapup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -BSP_PIECES=startup tty +BSP_PIECES = startup tty # pieces to pick up out of libcpu/hppa -CPU_PIECES=clock milli timer -GENERIC_PIECES= +CPU_PIECES = clock milli timer +GENERIC_PIECES = -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg -ifeq ($(HAS_MP),yes) -GENERIC_PIECES += shmdr -BSP_PIECES += shmsupp -endif +INSTALL = @INSTALL@ +INSTALL_CHANGE = @INSTALL_CHANGE@ + +GENERIC_MP_REL_PIECES_yes_V = shmdr +GENERIC_MP_REL_PIECES_no_V = +GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V) + +BSP_MP_O_PIECES_yes_V = shmsupp +BSP_MP_O_PIECES_no_V = +BSP_PIECES += $(BSP_MP_O_PIECES_$(HAS_MP)_V) # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS=$(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(foreach piece, $(CPU_PIECES), \ - ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) \ - $(foreach piece, $(GENERIC_PIECES), \ - ../../../$(piece)/$(ARCH)/$(piece).rel) -LIB=$(ARCH)/libbsp.a +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ + $(foreach piece, $(CPU_PIECES), \ + ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) $(foreach \ + piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) +LIB = $(ARCH)/libbsp.a # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -61,12 +64,12 @@ CLOBBER_ADDITIONS += $(LIB): ${OBJS} $(make-library) -all: ${ARCH} $(SRCS) $(LIB) - $(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(LIB) + $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib -$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs +$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs $(INSTALL_DATA) $< $@ -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/Makefile.in b/c/src/lib/libbsp/i386/Makefile.in index f9829549db..63474735c5 100644 --- a/c/src/lib/libbsp/i386/Makefile.in +++ b/c/src/lib/libbsp/i386/Makefile.in @@ -5,22 +5,22 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/lib/libbsp/i386 +top_builddir = ../.. +subdir = libbsp/i386 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # Descend into the $(RTEMS_BSP_FAMILY) directory -SUB_DIRS=shared $(RTEMS_BSP_FAMILY) +SUB_DIRS = shared $(RTEMS_BSP_FAMILY) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/force386/Makefile.in b/c/src/lib/libbsp/i386/force386/Makefile.in index aaa5ee3422..bf69c6d0bd 100644 --- a/c/src/lib/libbsp/i386/force386/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/Makefile.in @@ -5,27 +5,27 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/lib/libbsp/i386/force386 +top_builddir = ../../.. +subdir = libbsp/i386/force386 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # We only build the multiprocessing support if HAS_MP was defined MP_SUPPORT_yes_V = shmsupp MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS=include start startup clock console $(MP_SUPPORT) timer wrapup +SUB_DIRS = include start startup clock console $(MP_SUPPORT) timer wrapup -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/force386/clock/Makefile.in b/c/src/lib/libbsp/i386/force386/clock/Makefile.in index 58f187f2c9..dfea79f59c 100644 --- a/c/src/lib/libbsp/i386/force386/clock/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/clock/Makefile.in @@ -5,42 +5,42 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/force386/clock +top_builddir = ../../../.. +subdir = libbsp/i386/force386/clock -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/clock.rel +PGM = ${ARCH}/clock.rel # C source names, if any, go here -- minus the .c -C_PIECES=ckinit -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = ckinit +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -55,11 +55,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/force386/console/Makefile.in b/c/src/lib/libbsp/i386/force386/console/Makefile.in index 1e8270cf0b..588289939b 100644 --- a/c/src/lib/libbsp/i386/force386/console/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/console/Makefile.in @@ -5,42 +5,42 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/force386/console +top_builddir = ../../../.. +subdir = libbsp/i386/force386/console -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/console.rel +PGM = ${ARCH}/console.rel # C source names, if any, go here -- minus the .c -C_PIECES=console -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = console +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -55,11 +55,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/force386/include/Makefile.in b/c/src/lib/libbsp/i386/force386/include/Makefile.in index 82eeb58100..b1db22952d 100644 --- a/c/src/lib/libbsp/i386/force386/include/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/include/Makefile.in @@ -5,12 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/force386/include +top_builddir = ../../../.. +subdir = libbsp/i386/force386/include -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ @@ -27,18 +25,26 @@ H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h EQ_FILES = -SRCS=$(H_FILES) $(EQ_FILES) +SRCS = $(H_FILES) $(EQ_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) - $(INSTALL_CHANGE) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE) +all: $(SRCS) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(EQ_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/force386/shmsupp/Makefile.in b/c/src/lib/libbsp/i386/force386/shmsupp/Makefile.in index e77d97defc..b51bd468f1 100644 --- a/c/src/lib/libbsp/i386/force386/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/shmsupp/Makefile.in @@ -5,42 +5,42 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/force386/shmsupp +top_builddir = ../../../.. +subdir = libbsp/i386/force386/shmsupp -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/shmsupp.rel +PGM = ${ARCH}/shmsupp.rel # C source names, if any, go here -- minus the .c -C_PIECES=addrconv getcfg lock mpisr -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = addrconv getcfg lock mpisr +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -55,11 +55,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/force386/start/Makefile.in b/c/src/lib/libbsp/i386/force386/start/Makefile.in index 3b00303900..b7fa02604b 100644 --- a/c/src/lib/libbsp/i386/force386/start/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/start/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/force386/start +top_builddir = ../../../.. +subdir = libbsp/i386/force386/start -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGMS=${ARCH}/start.o +PGMS = ${ARCH}/start.o # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES=start -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = start +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -57,12 +57,12 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) $(OBJS) $(PGM) - $(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(OBJS) $(PGM) + $(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/force386/startup/Makefile.in b/c/src/lib/libbsp/i386/force386/startup/Makefile.in index ec2ec33a7c..38b09f1e7e 100644 --- a/c/src/lib/libbsp/i386/force386/startup/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/startup/Makefile.in @@ -5,47 +5,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/force386/startup +top_builddir = ../../../.. +subdir = libbsp/i386/force386/startup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@:@srcdir@/../../../shared -PGM=${ARCH}/startup.rel +PGM = ${ARCH}/startup.rel # C source names, if any, go here -- minus the .c -C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk setvec gnatinstallhandler -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = bspclean bsplibc bsppost bspstart bootcard main sbrk setvec \ + gnatinstallhandler +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES=ldsegs -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = ldsegs +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(srcdir)/linkcmds $(C_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(S_O_FILES) +SRCS = $(srcdir)/linkcmds $(C_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_RELEASE)/lib + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -59,11 +66,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) - $(INSTALL_CHANGE) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(PGM) + $(INSTALL_CHANGE) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/force386/timer/Makefile.in b/c/src/lib/libbsp/i386/force386/timer/Makefile.in index 55c3e397bf..fe43b26d08 100644 --- a/c/src/lib/libbsp/i386/force386/timer/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/timer/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/force386/timer +top_builddir = ../../../.. +subdir = libbsp/i386/force386/timer -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/timer.rel +PGM = ${ARCH}/timer.rel # C source names, if any, go here -- minus the .c -C_PIECES=timer -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = timer +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES=timerisr -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = timerisr +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -60,11 +60,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in b/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in index 6b46a3a0d6..19f56bdcea 100644 --- a/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in @@ -5,43 +5,48 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/force386/wrapup +top_builddir = ../../../.. +subdir = libbsp/i386/force386/wrapup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -BSP_PIECES=startup clock console timer -GENERIC_PIECES= +BSP_PIECES = startup clock console timer +GENERIC_PIECES = -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg -ifeq ($(HAS_MP),yes) -GENERIC_PIECES += shmdr -BSP_PIECES += shmsupp -endif +INSTALL = @INSTALL@ +INSTALL_CHANGE = @INSTALL_CHANGE@ + +GENERIC_MP_REL_PIECES_yes_V = shmdr +GENERIC_MP_REL_PIECES_no_V = +GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V) + +BSP_MP_O_PIECES_yes_V = shmsupp +BSP_MP_O_PIECES_no_V = +BSP_PIECES += $(BSP_MP_O_PIECES_$(HAS_MP)_V) # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS=$(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) -LIB=$(ARCH)/libbsp.a +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ + $(foreach piece, $(GENERIC_PIECES), \ + ../../../$(piece)/$(ARCH)/$(piece).rel) +LIB = $(ARCH)/libbsp.a # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -56,12 +61,12 @@ CLOBBER_ADDITIONS += $(LIB): ${OBJS} $(make-library) -all: ${ARCH} $(SRCS) $(LIB) - $(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(LIB) + $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib -$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs +$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs $(INSTALL_DATA) $< $@ -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/go32/Makefile.in b/c/src/lib/libbsp/i386/go32/Makefile.in index 070b272eb4..43915fd52f 100644 --- a/c/src/lib/libbsp/i386/go32/Makefile.in +++ b/c/src/lib/libbsp/i386/go32/Makefile.in @@ -5,23 +5,23 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/lib/libbsp/i386/go32 +top_builddir = ../../.. +subdir = libbsp/i386/go32 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS=include startup clock console timer wrapup +SUB_DIRS = include startup clock console timer wrapup -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/go32/clock/Makefile.in b/c/src/lib/libbsp/i386/go32/clock/Makefile.in index ff4b996ca3..2db5025e37 100644 --- a/c/src/lib/libbsp/i386/go32/clock/Makefile.in +++ b/c/src/lib/libbsp/i386/go32/clock/Makefile.in @@ -5,42 +5,42 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/go32/clock +top_builddir = ../../../.. +subdir = libbsp/i386/go32/clock -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/clock.rel +PGM = ${ARCH}/clock.rel # C source names, if any, go here -- minus the .c -C_PIECES=ckinit rtc -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = ckinit rtc +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -55,11 +55,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/go32/console/Makefile.in b/c/src/lib/libbsp/i386/go32/console/Makefile.in index d7506981a9..3c6c05e591 100644 --- a/c/src/lib/libbsp/i386/go32/console/Makefile.in +++ b/c/src/lib/libbsp/i386/go32/console/Makefile.in @@ -5,42 +5,42 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/go32/console +top_builddir = ../../../.. +subdir = libbsp/i386/go32/console -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/console.rel +PGM = ${ARCH}/console.rel # C source names, if any, go here -- minus the .c -C_PIECES=console inch outch -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = console inch outch +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -55,11 +55,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/go32/include/Makefile.in b/c/src/lib/libbsp/i386/go32/include/Makefile.in index fbb1ea477a..86e8b43132 100644 --- a/c/src/lib/libbsp/i386/go32/include/Makefile.in +++ b/c/src/lib/libbsp/i386/go32/include/Makefile.in @@ -5,12 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/go32/include +top_builddir = ../../../.. +subdir = libbsp/i386/go32/include -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ @@ -27,18 +25,26 @@ H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h EQ_FILES = -SRCS=$(H_FILES) $(EQ_FILES) +SRCS = $(H_FILES) $(EQ_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) - $(INSTALL_CHANGE) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE) +all: $(SRCS) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(EQ_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/go32/startup/Makefile.in b/c/src/lib/libbsp/i386/go32/startup/Makefile.in index ff1a52288d..9303f2e59d 100644 --- a/c/src/lib/libbsp/i386/go32/startup/Makefile.in +++ b/c/src/lib/libbsp/i386/go32/startup/Makefile.in @@ -5,42 +5,42 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/go32/startup +top_builddir = ../../../.. +subdir = libbsp/i386/go32/startup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@:@srcdir@/../../../shared -PGM=${ARCH}/startup.rel +PGM = ${ARCH}/startup.rel # C source names, if any, go here -- minus the .c -C_PIECES=bsplibc bsppost bspstart sbrk setvec gnatinstallhandler -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = bsplibc bsppost bspstart sbrk setvec gnatinstallhandler +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -54,11 +54,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/go32/timer/Makefile.in b/c/src/lib/libbsp/i386/go32/timer/Makefile.in index 9aa332ce0c..dd36472983 100644 --- a/c/src/lib/libbsp/i386/go32/timer/Makefile.in +++ b/c/src/lib/libbsp/i386/go32/timer/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/go32/timer +top_builddir = ../../../.. +subdir = libbsp/i386/go32/timer -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/timer.rel +PGM = ${ARCH}/timer.rel # C source names, if any, go here -- minus the .c -C_PIECES=timer -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = timer +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES=timerisr -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = timerisr +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -60,11 +60,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/go32/wrapup/Makefile.in b/c/src/lib/libbsp/i386/go32/wrapup/Makefile.in index 7ce95fed37..2828605720 100644 --- a/c/src/lib/libbsp/i386/go32/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i386/go32/wrapup/Makefile.in @@ -5,38 +5,40 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/go32/wrapup +top_builddir = ../../../.. +subdir = libbsp/i386/go32/wrapup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -BSP_PIECES=startup clock console timer -GENERIC_PIECES= +BSP_PIECES = startup clock console timer +GENERIC_PIECES = # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS=$(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) -LIB=$(ARCH)/libbsp.a +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ + $(foreach piece, $(GENERIC_PIECES), \ + ../../../$(piece)/$(ARCH)/$(piece).rel) +LIB = $(ARCH)/libbsp.a -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL = @INSTALL@ +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -51,14 +53,14 @@ CLOBBER_ADDITIONS += $(LIB): ${OBJS} $(make-library) -all: ${ARCH} $(SRCS) $(LIB) - $(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(LIB) + $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib -install: all +install: all -$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs +$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs $(INSTALL_DATA) $< $@ -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/i386ex/Makefile.in b/c/src/lib/libbsp/i386/i386ex/Makefile.in index a151e88656..435d90939b 100644 --- a/c/src/lib/libbsp/i386/i386ex/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/Makefile.in @@ -5,27 +5,27 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/lib/libbsp/i386/i386ex +top_builddir = ../../.. +subdir = libbsp/i386/i386ex -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # We only build the Network library if HAS_NETWORKING was defined NETWORK_yes_V = network NETWORK = $(NETWORK_$(HAS_NETWORKING)_V) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS=include start startup clock console timer $(NETWORK) wrapup +SUB_DIRS = include start startup clock console timer $(NETWORK) wrapup -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/i386ex/clock/Makefile.in b/c/src/lib/libbsp/i386/i386ex/clock/Makefile.in index b03311d9c9..8353cf4131 100644 --- a/c/src/lib/libbsp/i386/i386ex/clock/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/clock/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/i386ex/clock +top_builddir = ../../../.. +subdir = libbsp/i386/i386ex/clock -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/clock.rel +PGM = ${ARCH}/clock.rel # C source names, if any, go here -- minus the .c -C_PIECES=ckinit -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = ckinit +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -60,11 +60,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/i386ex/console/Makefile.in b/c/src/lib/libbsp/i386/i386ex/console/Makefile.in index c9d92930e4..898e8a5257 100644 --- a/c/src/lib/libbsp/i386/i386ex/console/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/console/Makefile.in @@ -5,48 +5,48 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/i386ex/console +top_builddir = ../../../.. +subdir = libbsp/i386/i386ex/console -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/console.rel +PGM = ${ARCH}/console.rel -IMPORT_SRC=$(srcdir)/../../shared/io/printk.c +IMPORT_SRC = $(srcdir)/../../shared/io/printk.c # C source names, if any, go here -- minus the .c -C_PIECES=console printk -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = console printk +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += -CFLAGS += +DEFINES += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,17 +58,17 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -preinstall: +preinstall: ${CP} ${IMPORT_SRC} . ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} preinstall $(SRCS) $(PGM) +all: ${ARCH} preinstall $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/i386ex/include/Makefile.in b/c/src/lib/libbsp/i386/i386ex/include/Makefile.in index 5457f970ce..6b6742c5ee 100644 --- a/c/src/lib/libbsp/i386/i386ex/include/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/include/Makefile.in @@ -5,12 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/i386ex/include +top_builddir = ../../../.. +subdir = libbsp/i386/i386ex/include -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ @@ -27,20 +25,28 @@ H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h EQ_FILES = -SRCS=$(H_FILES) $(EQ_FILES) +SRCS = $(H_FILES) $(EQ_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) - $(INSTALL_CHANGE) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE) +all: $(SRCS) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(EQ_FILES) $(PROJECT_INCLUDE) -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/i386ex/network/Makefile.in b/c/src/lib/libbsp/i386/i386ex/network/Makefile.in index c070558e4e..0ea5a66e64 100644 --- a/c/src/lib/libbsp/i386/i386ex/network/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/network/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/i386ex/network +top_builddir = ../../../.. +subdir = libbsp/i386/i386ex/network -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/network.rel +PGM = ${ARCH}/network.rel # C source names, if any, go here -- minus the .c -C_PIECES=network -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = network +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .s -S_PIECES= -S_FILES=$(S_PIECES:%=%.s) -S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.s) +S_O_FILES = $(S_FILES:%.s=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += -O0 +CFLAGS += -O0 -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -60,11 +60,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/i386ex/start/Makefile.in b/c/src/lib/libbsp/i386/i386ex/start/Makefile.in index 2a102f9e94..cf782cefcb 100644 --- a/c/src/lib/libbsp/i386/i386ex/start/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/start/Makefile.in @@ -5,52 +5,48 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/i386ex/start +top_builddir = ../../../.. +subdir = libbsp/i386/i386ex/start -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -RTEMS_GAS_CODE16 = @RTEMS_GAS_CODE16@ - -PGMS=${ARCH}/start.o +PGMS = ${ARCH}/start.o # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES=start -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = start +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -ifeq ($(RTEMS_GAS_CODE16),yes) -DEFINES += -DNEW_GAS -endif +@RTEMS_GAS_CODE16_TRUE@CPPFLAGS += -DNEW_GAS CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -62,12 +58,12 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) $(OBJS) $(PGM) - $(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(OBJS) $(PGM) + $(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in index 46219dd8a3..c0c86d4cae 100644 --- a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in @@ -5,51 +5,59 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/i386ex/startup +top_builddir = ../../../.. +subdir = libbsp/i386/i386ex/startup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ -VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/comm:@srcdir@/../../shared/irq:@srcdir@/../../shared/io +VPATH = \ + @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/comm:@srcdir@/../../shared/irq:@srcdir@/../../shared/io -PGM=${ARCH}/startup.rel +PGM = ${ARCH}/startup.rel # C source names, if any, go here -- minus the .c -C_PIECES=bspclean bsplibc bsppost bspstart bootcard main sbrk irq irq_init i386-stub-glue uart i386-stub gnatinstallhandler +C_PIECES = bspclean bsplibc bsppost bspstart bootcard main sbrk irq irq_init \ + i386-stub-glue uart i386-stub gnatinstallhandler -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S # removed initcsu piece, ldsegs piece and flush -S_PIECES=irq_asm -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = irq_asm +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(srcdir)/linkcmds $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(srcdir)/linkcmds $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_RELEASE)/lib + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # #DEFINES += -DPRINTON -DEFINES += -I$(srcdir) -DBSP_IS_I386EX=1 +DEFINES += -I$(srcdir) -DBSP_IS_I386EX=1 CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -63,12 +71,12 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) - $(INSTALL_CHANGE) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(PGM) + $(INSTALL_CHANGE) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/i386ex/timer/Makefile.in b/c/src/lib/libbsp/i386/i386ex/timer/Makefile.in index 66a53db647..312261a8f5 100644 --- a/c/src/lib/libbsp/i386/i386ex/timer/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/timer/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/i386ex/timer +top_builddir = ../../../.. +subdir = libbsp/i386/i386ex/timer -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/timer.rel +PGM = ${ARCH}/timer.rel # C source names, if any, go here -- minus the .c -C_PIECES=timer -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = timer +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES=timerisr -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = timerisr +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -60,11 +60,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.in b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.in index 3ac2a219c3..3a6bd73ae4 100644 --- a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.in @@ -5,42 +5,44 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/i386ex/wrapup +top_builddir = ../../../.. +subdir = libbsp/i386/i386ex/wrapup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -BSP_PIECES=startup clock console timer $(NETWORK) -GENERIC_PIECES= +BSP_PIECES = startup clock console timer $(NETWORK) +GENERIC_PIECES = # We only build the Network library if HAS_NETWORKING was defined NETWORK_yes_V = network NETWORK = $(NETWORK_$(HAS_NETWORKING)_V) # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS=$(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) -LIB=$(ARCH)/libbsp.a +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ + $(foreach piece, $(GENERIC_PIECES), \ + ../../../$(piece)/$(ARCH)/$(piece).rel) +LIB = $(ARCH)/libbsp.a -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL = @INSTALL@ +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -55,14 +57,14 @@ CLOBBER_ADDITIONS += $(LIB): ${OBJS} $(make-library) -all: ${ARCH} $(SRCS) $(LIB) - $(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(LIB) + $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib -install: all +install: all -$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs +$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs $(INSTALL_DATA) $< $@ -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.in b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.in index 6e926826dc..c9503553d0 100644 --- a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.in @@ -5,42 +5,42 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/pc386/3c509 +top_builddir = ../../../.. +subdir = libbsp/i386/pc386/3c509 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/3c509.rel +PGM = ${ARCH}/3c509.rel # C source names, if any, go here -- minus the .c -C_PIECES=3c509 elink -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = 3c509 elink +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ +DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -55,11 +55,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.in b/c/src/lib/libbsp/i386/pc386/Makefile.in index 2827b729a4..52f7a70263 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/Makefile.in @@ -5,28 +5,27 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/lib/libbsp/i386/pc386 +top_builddir = ../../.. +subdir = libbsp/i386/pc386 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # We only build the Network library if HAS_NETWORKING was defined NETWORK_yes_V = dec21140 ne2000 wd8003 3c509 NETWORK = $(NETWORK_$(HAS_NETWORKING)_V) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS=include tools start startup clock console timer $(NETWORK) \ - wrapup +SUB_DIRS = include tools start startup clock console timer $(NETWORK) wrapup -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/pc386/clock/Makefile.in b/c/src/lib/libbsp/i386/pc386/clock/Makefile.in index bde7f7cb16..69d49d46c1 100644 --- a/c/src/lib/libbsp/i386/pc386/clock/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/clock/Makefile.in @@ -5,42 +5,42 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/pc386/clock +top_builddir = ../../../.. +subdir = libbsp/i386/pc386/clock -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/clock.rel +PGM = ${ARCH}/clock.rel # C source names, if any, go here -- minus the .c -C_PIECES=ckinit rtc -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = ckinit rtc +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -55,11 +55,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/pc386/console/Makefile.in b/c/src/lib/libbsp/i386/pc386/console/Makefile.in index 2b33bf896e..66f5ed13e7 100644 --- a/c/src/lib/libbsp/i386/pc386/console/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/console/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/pc386/console +top_builddir = ../../../.. +subdir = libbsp/i386/pc386/console -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@:@srcdir@/../../shared/io -PGM=${ARCH}/console.rel +PGM = ${ARCH}/console.rel # C source names, if any, go here -- minus the .c -C_PIECES=console inch outch printk -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = console inch outch printk +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES=videoAsm -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = videoAsm +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -60,11 +60,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/pc386/dec21140/Makefile.in b/c/src/lib/libbsp/i386/pc386/dec21140/Makefile.in index 6ebc4bb867..56e05143e9 100644 --- a/c/src/lib/libbsp/i386/pc386/dec21140/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/dec21140/Makefile.in @@ -5,42 +5,42 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/pc386/dec21140 +top_builddir = ../../../.. +subdir = libbsp/i386/pc386/dec21140 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/dec21140.rel +PGM = ${ARCH}/dec21140.rel # C source names, if any, go here -- minus the .c -C_PIECES=dec21140 -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = dec21140 +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ +DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -55,11 +55,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/pc386/include/Makefile.in b/c/src/lib/libbsp/i386/pc386/include/Makefile.in index ff1e6c964a..57585a0efe 100644 --- a/c/src/lib/libbsp/i386/pc386/include/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/include/Makefile.in @@ -5,12 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/pc386/include +top_builddir = ../../../.. +subdir = libbsp/i386/pc386/include -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ @@ -20,8 +18,7 @@ VPATH = @srcdir@ WD80X3_yes_V = $(srcdir)/wd80x3.h WD80X3 = $(WD80X3_$(HAS_NETWORKING)_V) -H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h $(srcdir)/crt.h \ - $(WD80X3) +H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h $(srcdir)/crt.h $(WD80X3) # # Equate files are for including from assembly preprocessed by @@ -33,18 +30,26 @@ H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h $(srcdir)/crt.h \ EQ_FILES = -SRCS=$(H_FILES) $(EQ_FILES) +SRCS = $(H_FILES) $(EQ_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) - $(INSTALL_CHANGE) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE) +all: $(SRCS) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(EQ_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.in b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.in index d4ded9e8e3..8e5f7e4f45 100644 --- a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.in @@ -5,42 +5,42 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/pc386/ne2000 +top_builddir = ../../../.. +subdir = libbsp/i386/pc386/ne2000 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/ne2000.rel +PGM = ${ARCH}/ne2000.rel # C source names, if any, go here -- minus the .c -C_PIECES=ne2000 -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = ne2000 +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ +DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -55,11 +55,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/pc386/start/Makefile.in b/c/src/lib/libbsp/i386/pc386/start/Makefile.in index 1738dabe65..9d3388cdba 100644 --- a/c/src/lib/libbsp/i386/pc386/start/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/start/Makefile.in @@ -5,50 +5,46 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/pc386/start +top_builddir = ../../../.. +subdir = libbsp/i386/pc386/start -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -RTEMS_GAS_CODE16 = @RTEMS_GAS_CODE16@ - -PGMS=${ARCH}/start.o ${ARCH}/start16.bin +PGMS = ${ARCH}/start.o ${ARCH}/start16.bin # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES=start16 start -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = start16 start +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -ifeq ($(RTEMS_GAS_CODE16),yes) -CPPFLAGS += -DNEW_GAS -endif -CFLAGS += +@RTEMS_GAS_CODE16_TRUE@CPPFLAGS += -DNEW_GAS +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -60,13 +56,13 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) $(OBJS) $(PGMS) - $(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(OBJS) $(PGMS) + $(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -LINKCMDS=$(srcdir)/../startup/linkcmds +LINKCMDS = $(srcdir)/../startup/linkcmds ${ARCH}/start16.o: start16.S ${COMPILE.S} -DHEADERADDR=$(HEADERADDR) -o $@ $< @@ -76,6 +72,6 @@ ${ARCH}/start16.bin: ${ARCH}/start16.o --oformat=elf32-i386 -o $(basename $@).obj $(basename $@).o $(OBJCOPY) -O binary $(basename $@).obj $@ -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/pc386/startup/Makefile.in b/c/src/lib/libbsp/i386/pc386/startup/Makefile.in index d881224d85..2b898d4518 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/startup/Makefile.in @@ -5,49 +5,57 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/pc386/startup +top_builddir = ../../../.. +subdir = libbsp/i386/pc386/startup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ -VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/irq:@srcdir@/../../shared/comm:@srcdir@/../../shared/pci +VPATH = \ + @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/irq:@srcdir@/../../shared/comm:@srcdir@/../../shared/pci -PGM=${ARCH}/startup.rel +PGM = ${ARCH}/startup.rel # C source names, if any, go here -- minus the .c -C_PIECES=bsplibc bsppost bspstart exit irq irq_init bootcard main sbrk i386-stub i386-stub-glue uart pcibios gnatinstallhandler -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = bsplibc bsppost bspstart exit irq irq_init bootcard main sbrk \ + i386-stub i386-stub-glue uart pcibios gnatinstallhandler +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES=ldsegs irq_asm -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = ldsegs irq_asm +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(srcdir)/linkcmds $(C_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(S_O_FILES) +SRCS = $(srcdir)/linkcmds $(C_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_RELEASE)/lib + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # # USE_INIT_FINI tells main.c what C++ help we need. -DEFINES += -DUSE_INIT_FINI +DEFINES += -DUSE_INIT_FINI CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -61,11 +69,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) - $(INSTALL_CHANGE) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(PGM) + $(INSTALL_CHANGE) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/pc386/timer/Makefile.in b/c/src/lib/libbsp/i386/pc386/timer/Makefile.in index f21c351dd8..f15980b605 100644 --- a/c/src/lib/libbsp/i386/pc386/timer/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/timer/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/pc386/timer +top_builddir = ../../../.. +subdir = libbsp/i386/pc386/timer -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/timer.rel +PGM = ${ARCH}/timer.rel # C source names, if any, go here -- minus the .c -C_PIECES=timer -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = timer +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES=timerisr -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = timerisr +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -60,11 +60,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/pc386/tools/Makefile.am b/c/src/lib/libbsp/i386/pc386/tools/Makefile.am index d428bd29e4..35c8285fc7 100644 --- a/c/src/lib/libbsp/i386/pc386/tools/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/tools/Makefile.am @@ -2,8 +2,8 @@ # $Id$ # -AUTOMAKE_OPTIONS = foreign -ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal EXTRA_DIST = Spec.doc @@ -18,8 +18,8 @@ binpatch_SOURCES = binpatch.c preinstall: install-exec-local install-exec-local: $(PROGRAMS) - $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools - $(INSTALL_PROGRAM) bin2boot $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools - $(INSTALL_PROGRAM) binpatch $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools + $(mkinstalldirs) $(PROJECT_ROOT)/pc386/build-tools + $(INSTALL_PROGRAM) bin2boot $(PROJECT_ROOT)/pc386/build-tools + $(INSTALL_PROGRAM) binpatch $(PROJECT_ROOT)/pc386/build-tools include $(top_srcdir)/../../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/pc386/tools/Makefile.in b/c/src/lib/libbsp/i386/pc386/tools/Makefile.in index b878f28f71..a003c6fd50 100644 --- a/c/src/lib/libbsp/i386/pc386/tools/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/tools/Makefile.in @@ -44,6 +44,8 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . + +ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ @@ -67,16 +69,25 @@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ CC = @CC@ +INSTALL_CHANGE = @INSTALL_CHANGE@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ +PACKHEX = @PACKHEX@ PROJECT_ROOT = @PROJECT_ROOT@ RTEMS_CPU = @RTEMS_CPU@ RTEMS_ROOT = @RTEMS_ROOT@ RTEMS_TOPdir = @RTEMS_TOPdir@ VERSION = @VERSION@ +project_bindir = @project_bindir@ +project_includedir = @project_includedir@ +project_libdir = @project_libdir@ +rtems_bspdir = @rtems_bspdir@ +rtems_makedir = @rtems_makedir@ +tooldir = @tooldir@ -AUTOMAKE_OPTIONS = foreign -ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal EXTRA_DIST = Spec.doc @@ -121,19 +132,19 @@ OBJECTS = $(bin2boot_OBJECTS) $(binpatch_OBJECTS) all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../../../../../automake/local.am +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../../../../../automake/local.am cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(ACLOCAL_M4): configure.in - cd $(srcdir) && $(ACLOCAL) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) mostlyclean-noinstPROGRAMS: @@ -362,9 +373,9 @@ maintainer-clean preinstall: install-exec-local install-exec-local: $(PROGRAMS) - $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools - $(INSTALL_PROGRAM) bin2boot $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools - $(INSTALL_PROGRAM) binpatch $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools + $(mkinstalldirs) $(PROJECT_ROOT)/pc386/build-tools + $(INSTALL_PROGRAM) bin2boot $(PROJECT_ROOT)/pc386/build-tools + $(INSTALL_PROGRAM) binpatch $(PROJECT_ROOT)/pc386/build-tools debug-am: debug: debug-am diff --git a/c/src/lib/libbsp/i386/pc386/tools/aclocal.m4 b/c/src/lib/libbsp/i386/pc386/tools/aclocal.m4 index b7fa6c0106..7d2cb397fc 100644 --- a/c/src/lib/libbsp/i386/pc386/tools/aclocal.m4 +++ b/c/src/lib/libbsp/i386/pc386/tools/aclocal.m4 @@ -27,10 +27,6 @@ TARGET_SUBDIR=".") RTEMS_TOPdir="$1"; AC_SUBST(RTEMS_TOPdir) -PROJECT_ROOT=`pwd`/$RTEMS_TOPdir; -test "$TARGET_SUBDIR" = "." || PROJECT_ROOT="$PROJECT_ROOT/.." -AC_SUBST(PROJECT_ROOT) - dnl Determine RTEMS Version string from the VERSION file dnl Hopefully, Joel never changes its format ;- AC_MSG_CHECKING([for RTEMS Version]) @@ -46,9 +42,6 @@ if test -z "$RTEMS_VERSION"; then AC_MSG_ERROR(Unable to determine version) fi AC_MSG_RESULT($RTEMS_VERSION) - -RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir; -AC_SUBST(RTEMS_ROOT) ])dnl dnl @@ -184,3 +177,85 @@ else fi AC_SUBST($1)]) +# Add --enable-maintainer-mode option to configure. +# From Jim Meyering + +# serial 1 + +AC_DEFUN(AM_MAINTAINER_MODE, +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT($USE_MAINTAINER_MODE) + AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +# Define a conditional. + +AC_DEFUN(AM_CONDITIONAL, +[AC_SUBST($1_TRUE) +AC_SUBST($1_FALSE) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi]) + +dnl +dnl $Id$ +dnl + +AC_DEFUN(RTEMS_PROJECT_ROOT, +[dnl +AC_REQUIRE([RTEMS_TOP]) +if test "$TARGET_SUBDIR" = "." ; then +PROJECT_ROOT=$RTEMS_TOPdir/'$(top_builddir)'; +else +PROJECT_ROOT=../$RTEMS_TOPdir/'$(top_builddir)' +fi +AC_SUBST(PROJECT_ROOT) + +RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP +AC_SUBST(RTEMS_ROOT) + +INSTALL_CHANGE="\$(KSH) \$(PROJECT_ROOT)/tools/build/install-if-change" +AC_SUBST(INSTALL_CHANGE) + +PACKHEX="\$(PROJECT_ROOT)/tools/build/packhex" +AC_SUBST(PACKHEX) +]) + + +AC_DEFUN(RTEMS_TOOLPATHS, +[ +# tooldir='$(exec_prefix)/'$target_alias +# Temporary work-around until building in source tree is supported +AC_REQUIRE([RTEMS_PROJECT_ROOT]) + +tooldir='$(PROJECT_ROOT)' +AC_SUBST(tooldir) + +project_includedir='$(tooldir)'/include +AC_SUBST(project_includedir) + +project_libdir='$(tooldir)/lib$(MULTISUBDIR)' +AC_SUBST(project_libdir) + +project_bindir='$(tooldir)/bin' +AC_SUBST(project_bindir) + +rtems_bspdir='$(prefix)/${RTEMS_BSP}' +AC_SUBST(rtems_bspdir) +rtems_makedir='$(prefix)/make' +AC_SUBST(rtems_makedir) +]) + diff --git a/c/src/lib/libbsp/i386/pc386/tools/configure b/c/src/lib/libbsp/i386/pc386/tools/configure index d7280f490e..c3c9011f64 100644 --- a/c/src/lib/libbsp/i386/pc386/tools/configure +++ b/c/src/lib/libbsp/i386/pc386/tools/configure @@ -13,6 +13,9 @@ ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help --with-target-subdir=DIR" +ac_help="$ac_help + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -555,12 +558,8 @@ fi RTEMS_TOPdir="../../../../../../.."; -PROJECT_ROOT=`pwd`/$RTEMS_TOPdir; -test "$TARGET_SUBDIR" = "." || PROJECT_ROOT="$PROJECT_ROOT/.." - - echo $ac_n "checking for RTEMS Version""... $ac_c" 1>&6 -echo "configure:564: checking for RTEMS Version" >&5 +echo "configure:563: checking for RTEMS Version" >&5 if test -r "${srcdir}/${RTEMS_TOPdir}/VERSION"; then RTEMS_VERSION=`grep Version ${srcdir}/${RTEMS_TOPdir}/VERSION | \ sed -e 's%RTEMS[ ]*Version[ ]*\(.*\)[ ]*%\1%g'` @@ -572,9 +571,6 @@ if test -z "$RTEMS_VERSION"; then fi echo "$ac_t""$RTEMS_VERSION" 1>&6 -RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir; - - # Do some error checking and defaulting for the host and target type. @@ -604,7 +600,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:608: checking host system type" >&5 +echo "configure:604: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -625,7 +621,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:629: checking target system type" >&5 +echo "configure:625: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -643,7 +639,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:647: checking build system type" >&5 +echo "configure:643: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -666,7 +662,7 @@ test "$host_alias" != "$target_alias" && program_prefix=${target_alias}- echo $ac_n "checking rtems target cpu""... $ac_c" 1>&6 -echo "configure:670: checking rtems target cpu" >&5 +echo "configure:666: checking rtems target cpu" >&5 case "${target}" in # hpux unix port should go here i[3456]86-go32-rtems*) @@ -704,7 +700,7 @@ echo "$ac_t""$RTEMS_CPU" 1>&6 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:708: checking for a BSD compatible install" >&5 +echo "configure:704: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -757,7 +753,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:761: checking whether build environment is sane" >&5 +echo "configure:757: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -814,7 +810,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:818: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:814: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -853,7 +849,7 @@ fi missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:857: checking for working aclocal" >&5 +echo "configure:853: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -866,7 +862,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:870: checking for working autoconf" >&5 +echo "configure:866: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -879,7 +875,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:883: checking for working automake" >&5 +echo "configure:879: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -892,7 +888,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:896: checking for working autoheader" >&5 +echo "configure:892: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -905,7 +901,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:909: checking for working makeinfo" >&5 +echo "configure:905: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -918,11 +914,34 @@ else fi +echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 +echo "configure:919: checking whether to enable maintainer-specific portions of Makefiles" >&5 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval="$enable_maintainer_mode" + USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 + + +if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + MAINT=$MAINTAINER_MODE_TRUE + + # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:926: checking for $ac_word" >&5 +echo "configure:945: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -952,7 +971,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:956: checking for $ac_word" >&5 +echo "configure:975: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1003,7 +1022,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1007: checking for $ac_word" >&5 +echo "configure:1026: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1035,7 +1054,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1039: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1058: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1046,12 +1065,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1050 "configure" +#line 1069 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1077,12 +1096,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1081: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1100: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1086: checking whether we are using GNU C" >&5 +echo "configure:1105: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1091,7 +1110,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1114: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1110,7 +1129,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1114: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1133: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1145,12 +1164,12 @@ fi for ac_func in strtol strtoul do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1149: checking for $ac_func" >&5 +echo "configure:1168: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1154 "configure" +#line 1173 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1173,7 +1192,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1198,6 +1217,46 @@ fi done + +if test "$TARGET_SUBDIR" = "." ; then +PROJECT_ROOT=$RTEMS_TOPdir/'$(top_builddir)'; +else +PROJECT_ROOT=../$RTEMS_TOPdir/'$(top_builddir)' +fi + + +RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP + + +INSTALL_CHANGE="\$(KSH) \$(PROJECT_ROOT)/tools/build/install-if-change" + + +PACKHEX="\$(PROJECT_ROOT)/tools/build/packhex" + + + +# tooldir='$(exec_prefix)/'$target_alias +# Temporary work-around until building in source tree is supported + + +tooldir='$(PROJECT_ROOT)' + + +project_includedir='$(tooldir)'/include + + +project_libdir='$(tooldir)/lib$(MULTISUBDIR)' + + +project_bindir='$(tooldir)/bin' + + +rtems_bspdir='$(prefix)/${RTEMS_BSP}' + +rtems_makedir='$(prefix)/make' + + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1344,8 +1403,6 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@RTEMS_TOPdir@%$RTEMS_TOPdir%g -s%@PROJECT_ROOT@%$PROJECT_ROOT%g -s%@RTEMS_ROOT@%$RTEMS_ROOT%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g @@ -1373,7 +1430,20 @@ s%@AUTOMAKE@%$AUTOMAKE%g s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g s%@SET_MAKE@%$SET_MAKE%g +s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g +s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g +s%@MAINT@%$MAINT%g s%@CC@%$CC%g +s%@PROJECT_ROOT@%$PROJECT_ROOT%g +s%@RTEMS_ROOT@%$RTEMS_ROOT%g +s%@INSTALL_CHANGE@%$INSTALL_CHANGE%g +s%@PACKHEX@%$PACKHEX%g +s%@tooldir@%$tooldir%g +s%@project_includedir@%$project_includedir%g +s%@project_libdir@%$project_libdir%g +s%@project_bindir@%$project_bindir%g +s%@rtems_bspdir@%$rtems_bspdir%g +s%@rtems_makedir@%$rtems_makedir%g CEOF EOF diff --git a/c/src/lib/libbsp/i386/pc386/tools/configure.in b/c/src/lib/libbsp/i386/pc386/tools/configure.in index accb5d2bfb..4ac349b8d2 100644 --- a/c/src/lib/libbsp/i386/pc386/tools/configure.in +++ b/c/src/lib/libbsp/i386/pc386/tools/configure.in @@ -9,10 +9,14 @@ RTEMS_TOP(../../../../../../..) RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-lib-libbsp-i386-pc386-tools,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE AC_PROG_CC AC_CHECK_FUNCS(strtol strtoul) +RTEMS_PROJECT_ROOT +RTEMS_TOOLPATHS + AC_OUTPUT( Makefile) diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.in b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.in index 7f7aa53fbb..c0c87c5e92 100644 --- a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.in @@ -5,42 +5,42 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/pc386/wd8003 +top_builddir = ../../../.. +subdir = libbsp/i386/pc386/wd8003 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/wd8003.rel +PGM = ${ARCH}/wd8003.rel # C source names, if any, go here -- minus the .c -C_PIECES=wd8003 -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = wd8003 +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ +DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -55,11 +55,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in index 0cc04742ad..85acc759f0 100644 --- a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in @@ -5,12 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/pc386/wrapup +top_builddir = ../../../.. +subdir = libbsp/i386/pc386/wrapup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ @@ -19,28 +17,38 @@ VPATH = @srcdir@ NETWORK_yes_V = dec21140 ne2000 wd8003 3c509 NETWORK = $(NETWORK_$(HAS_NETWORKING)_V) -BSP_PIECES=startup clock console timer $(NETWORK) -GENERIC_PIECES= +BSP_PIECES = startup clock console timer $(NETWORK) +GENERIC_PIECES = # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS=$(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) -LIB=$(ARCH)/libbsp.a +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ + $(foreach piece, $(GENERIC_PIECES), \ + ../../../$(piece)/$(ARCH)/$(piece).rel) +LIB = $(ARCH)/libbsp.a -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL = @INSTALL@ +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_RELEASE)/BootImgs + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -55,15 +63,18 @@ CLOBBER_ADDITIONS += $(LIB): ${OBJS} $(make-library) -all: ${ARCH} $(SRCS) $(LIB) - $(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib +all: preinstall ${ARCH} $(SRCS) $(LIB) + $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib + +# HACK: # we create here a directory specific to the PC386 BSP to store the BootImage # files so they can be easily found - mkdir -p ${PROJECT_RELEASE}/BootImgs +preinstall: $(INSTALLDIRS) + $(mkinstalldirs) $(INSTALLDIRS) -$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs +$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs $(INSTALL_DATA) $< $@ -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/shared/Makefile.in b/c/src/lib/libbsp/i386/shared/Makefile.in index e8d8e88cbe..d07487113e 100644 --- a/c/src/lib/libbsp/i386/shared/Makefile.in +++ b/c/src/lib/libbsp/i386/shared/Makefile.in @@ -5,22 +5,22 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/lib/libbsp/i386/shared +top_builddir = ../../.. +subdir = libbsp/i386/shared -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # Descend into the $(RTEMS_BSP_FAMILY) directory -SUB_DIRS=irq io comm pci +SUB_DIRS = irq io comm pci -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/shared/comm/Makefile.in b/c/src/lib/libbsp/i386/shared/comm/Makefile.in index e508f4e133..bf1a31e891 100644 --- a/c/src/lib/libbsp/i386/shared/comm/Makefile.in +++ b/c/src/lib/libbsp/i386/shared/comm/Makefile.in @@ -5,17 +5,15 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/shared/comm +top_builddir = ../../../.. +subdir = libbsp/i386/shared/comm -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -H_FILES = $(srcdir)/uart.h +H_FILES = $(srcdir)/uart.h # # Equate files are for including from assembly preprocessed by @@ -27,17 +25,25 @@ H_FILES = $(srcdir)/uart.h EQ_FILES = -SRCS=$(H_FILES) $(EQ_FILES) +SRCS = $(H_FILES) $(EQ_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + CLEAN_ADDITIONS += CLOBBER_ADDITIONS += preinstall all: $(SRCS) - $(INSTALL_CHANGE) -m 444 $(SRCS) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(SRCS) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/shared/io/Makefile.in b/c/src/lib/libbsp/i386/shared/io/Makefile.in index a2af100567..87a30d4613 100644 --- a/c/src/lib/libbsp/i386/shared/io/Makefile.in +++ b/c/src/lib/libbsp/i386/shared/io/Makefile.in @@ -5,12 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/shared/io +top_builddir = ../../../.. +subdir = libbsp/i386/shared/io -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ @@ -27,18 +25,26 @@ H_FILES = $(srcdir)/bspIo.h EQ_FILES = -SRCS=$(H_FILES) $(EQ_FILES) +SRCS = $(H_FILES) $(EQ_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + CLEAN_ADDITIONS += CLOBBER_ADDITIONS += preinstall all: $(SRCS) - $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) - $(INSTALL_CHANGE) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(EQ_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/shared/irq/Makefile.in b/c/src/lib/libbsp/i386/shared/irq/Makefile.in index 86614e5ea2..b59a09c995 100644 --- a/c/src/lib/libbsp/i386/shared/irq/Makefile.in +++ b/c/src/lib/libbsp/i386/shared/irq/Makefile.in @@ -5,17 +5,15 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/shared/irq +top_builddir = ../../../.. +subdir = libbsp/i386/shared/irq -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -H_FILES = $(srcdir)/irq.h $(srcdir)/irq_asm.h +H_FILES = $(srcdir)/irq.h $(srcdir)/irq_asm.h # # Equate files are for including from assembly preprocessed by @@ -27,18 +25,26 @@ H_FILES = $(srcdir)/irq.h $(srcdir)/irq_asm.h EQ_FILES = -SRCS=$(H_FILES) $(EQ_FILES) +SRCS = $(H_FILES) $(EQ_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + CLEAN_ADDITIONS += CLOBBER_ADDITIONS += preinstall all: $(SRCS) - $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) - $(INSTALL_CHANGE) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(EQ_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/shared/pci/Makefile.in b/c/src/lib/libbsp/i386/shared/pci/Makefile.in index 5b5077cda5..c673cfcca7 100644 --- a/c/src/lib/libbsp/i386/shared/pci/Makefile.in +++ b/c/src/lib/libbsp/i386/shared/pci/Makefile.in @@ -5,17 +5,15 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/shared/pci +top_builddir = ../../../.. +subdir = libbsp/i386/shared/pci -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -H_FILES = $(srcdir)/pcibios.h +H_FILES = $(srcdir)/pcibios.h # # Equate files are for including from assembly preprocessed by @@ -27,17 +25,25 @@ H_FILES = $(srcdir)/pcibios.h EQ_FILES = -SRCS=$(H_FILES) $(EQ_FILES) +SRCS = $(H_FILES) $(EQ_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + CLEAN_ADDITIONS += CLOBBER_ADDITIONS += preinstall all: $(SRCS) - $(INSTALL_CHANGE) -m 444 $(SRCS) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(SRCS) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/ts_386ex/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/Makefile.in index 29cc2940c6..29150201c2 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.in @@ -5,27 +5,27 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/lib/libbsp/i386/ts_386ex +top_builddir = ../../.. +subdir = libbsp/i386/ts_386ex -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # We only build the Network library if HAS_NETWORKING was defined NETWORK_yes_V = network NETWORK = $(NETWORK_$(HAS_NETWORKING)_V) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS=include start startup clock console timer $(NETWORK) wrapup +SUB_DIRS = include tools start startup clock console timer $(NETWORK) wrapup -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.in index ae44755dc5..5a01e3e231 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/ts_386ex/clock +top_builddir = ../../../.. +subdir = libbsp/i386/ts_386ex/clock -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ - -PGM=${ARCH}/clock.rel + +PGM = ${ARCH}/clock.rel # C source names, if any, go here -- minus the .c -C_PIECES=ckinit rtc -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = ckinit rtc +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -60,11 +60,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in index 872b966f52..f6c08a069e 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in @@ -5,48 +5,48 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/ts_386ex/console +top_builddir = ../../../.. +subdir = libbsp/i386/ts_386ex/console -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/console.rel +PGM = ${ARCH}/console.rel -IMPORT_SRC=$(srcdir)/../../shared/io/printk.c +IMPORT_SRC = $(srcdir)/../../shared/io/printk.c # C source names, if any, go here -- minus the .c -C_PIECES=console printk -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = console printk +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += -CFLAGS += +DEFINES += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,17 +58,17 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -preinstall: +preinstall: ${CP} ${IMPORT_SRC} . ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} preinstall $(SRCS) $(PGM) +all: ${ARCH} preinstall $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.in index 49be342e7a..de0a2b14b1 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.in @@ -5,12 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/ts_386ex/include +top_builddir = ../../../.. +subdir = libbsp/i386/ts_386ex/include -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ @@ -31,20 +29,28 @@ H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h $(NE2000) EQ_FILES = -SRCS=$(H_FILES) $(EQ_FILES) +SRCS = $(H_FILES) $(EQ_FILES) -include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) - $(INSTALL_CHANGE) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE) +all: $(SRCS) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(EQ_FILES) $(PROJECT_INCLUDE) -install: all +install: all -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.in index 62b211072f..49dc01d9a3 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.in @@ -5,43 +5,43 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/i386/ts_386ex/network +top_builddir = ../../../.. +subdir = libbsp/i386/ts_386ex/network -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/network.rel +PGM = ${ARCH}/network.rel # C source names, if any, go here -- minus the .c -C_PIECES=ne2000 -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = ne2000 +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) $(H_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (OPTIONAL) Add local stuff here using += # -DEFINES += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \ - -DDIAGNOSTIC -DBOOTP_COMPAT +DEFINES += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \ + -DBOOTP_COMPAT CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += |