diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-09-07 13:45:03 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-09-07 13:45:03 +0000 |
| commit | e1d8abbe2800defb344dcce54c401733edd1d37a (patch) | |
| tree | 56e416222d2ed47222be37f868a06c93656edc72 /c/src/make | |
| parent | Removed by patch rtems-rc-19990820-6.diff.gz from (diff) | |
| download | rtems-e1d8abbe2800defb344dcce54c401733edd1d37a.tar.bz2 | |
Applied patch rtems-rc-19990820-6.diff.gz from
Ralf Corsepius <corsepiu@faw.uni-ulm.de> which converted many
Makefile.in's to Makefile.am's. This added a lot of files.
Diffstat (limited to 'c/src/make')
| -rw-r--r-- | c/src/make/Makefile.in | 2 | ||||
| -rw-r--r-- | c/src/make/aclocal.m4 | 1 | ||||
| -rw-r--r-- | c/src/make/compilers/Makefile.in | 2 | ||||
| -rw-r--r-- | c/src/make/custom/Makefile.in | 2 | ||||
| -rw-r--r-- | c/src/make/custom/default.cfg.in | 15 |
5 files changed, 4 insertions, 18 deletions
diff --git a/c/src/make/Makefile.in b/c/src/make/Makefile.in index 384c6a7a1f..bac389769e 100644 --- a/c/src/make/Makefile.in +++ b/c/src/make/Makefile.in @@ -532,7 +532,7 @@ profile-am: profile: profile-am .PHONY: profile profile-am -preinstall-am: +preinstall-am: $(TMPINSTALL_FILES) preinstall: preinstall-am .PHONY: preinstall preinstall-am diff --git a/c/src/make/aclocal.m4 b/c/src/make/aclocal.m4 index 22e52563bc..457567023d 100644 --- a/c/src/make/aclocal.m4 +++ b/c/src/make/aclocal.m4 @@ -1017,6 +1017,7 @@ dnl AC_DEFUN(RTEMS_CHECK_CXX, [dnl AC_REQUIRE([RTEMS_CHECK_CPU])dnl +AC_REQUIRE([RTEMS_PROG_CC_FOR_TARGET])dnl AC_REQUIRE([RTEMS_PROG_CXX_FOR_TARGET])dnl AC_CACHE_CHECK([whether to build rtems++], rtems_cv_HAS_CPLUSPLUS, diff --git a/c/src/make/compilers/Makefile.in b/c/src/make/compilers/Makefile.in index 6a737104bd..a471e61a86 100644 --- a/c/src/make/compilers/Makefile.in +++ b/c/src/make/compilers/Makefile.in @@ -273,7 +273,7 @@ profile-am: profile: profile-am .PHONY: profile profile-am -preinstall-am: +preinstall-am: $(TMPINSTALL_FILES) preinstall: preinstall-am .PHONY: preinstall preinstall-am diff --git a/c/src/make/custom/Makefile.in b/c/src/make/custom/Makefile.in index 84a6c932f0..af7d852cbe 100644 --- a/c/src/make/custom/Makefile.in +++ b/c/src/make/custom/Makefile.in @@ -268,7 +268,7 @@ profile-am: profile: profile-am .PHONY: profile profile-am -preinstall-am: +preinstall-am: $(TMPINSTALL_FILES) preinstall: preinstall-am .PHONY: preinstall preinstall-am diff --git a/c/src/make/custom/default.cfg.in b/c/src/make/custom/default.cfg.in index 8bcc453475..aaf1507538 100644 --- a/c/src/make/custom/default.cfg.in +++ b/c/src/make/custom/default.cfg.in @@ -20,21 +20,6 @@ endif include $(RTEMS_ROOT)/make/main.cfg include $(RTEMS_ROOT)/make/bsp.cfg -# use the inline functions instead of the macros -# ref: src/exec/generic/Makefile -ifeq ($(RTEMS_USE_MACROS),yes) -INLINE=macros -INLINE_UPCASE= -else -INLINE=inline -INLINE_UPCASE=INLINE -endif - -# OBSOLETE: Not used inside the source tree anymore -# HOST Compiler config file -# You may also want to specify where the compiler resides here. -# CONFIG.$(HOST_ARCH).CC = $(PROJECT_ROOT)/make/compilers/gcc.cfg - ## Target compiler config file, if any CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg |