Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patch rtems-rc-4.5.0-diff from Ralf Corsepius to address a problem

Browse Source 
where user Makefiles where accidentally used when using the RTEMS
application Makefile scheme.
This commit is contained in:
Joel Sherrill
2000-02-19 15:46:40 +00:00
parent 2de8b1b2fa
commit 06383557e0
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
aclocal/prog-cxx.m4
View File

@@ -64,6 +64,8 @@ unset ac_cv_prog_gxx
unset ac_cv_prog_cc_g unset ac_cv_prog_cc_g
unset ac_cv_prog_cxx_works unset ac_cv_prog_cxx_works
unset ac_cv_prog_cxx_cross unset ac_cv_prog_cxx_cross
dnl somehow autoconf macros leave this file
rm -f conftest.C
]) ])
AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET, AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET,

2
c/src/make/Makefile.am
View File

@@ -48,5 +48,7 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
@echo rtems_cv_RTEMS_CPU_MODEL=\$${rtems_cv_RTEMS_CPU_MODEL=$(RTEMS_CPU_MODEL)} >> $@ @echo rtems_cv_RTEMS_CPU_MODEL=\$${rtems_cv_RTEMS_CPU_MODEL=$(RTEMS_CPU_MODEL)} >> $@
@echo rtems_cv_RTEMS_BSP_FAMILY=\$${rtems_cv_RTEMS_BSP_FAMILY=$(RTEMS_BSP_FAMILY)} >> $@ @echo rtems_cv_RTEMS_BSP_FAMILY=\$${rtems_cv_RTEMS_BSP_FAMILY=$(RTEMS_BSP_FAMILY)} >> $@
DISTCLEANFILES = @RTEMS_BSP@.cache
include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../automake/local.am

7
c/src/make/main.cfg.in
View File

@@ -61,14 +61,9 @@ $(TARGET_VARIANTS)
${ARCH}: ${ARCH}:
test -d ${ARCH} || mkdir ${ARCH} test -d ${ARCH} || mkdir ${ARCH}
# general purpose forcing dependency; try to use .PHONY instead
FORCEIT:
FORCE:
ifndef AUTOMAKE ifndef AUTOMAKE
distclean-generic: distclean-generic:
-$(RM) Makefile .#* $(CONFIG_CLEAN_FILES) -$(RM) .#* $(CONFIG_CLEAN_FILES)
-$(RM) -r $(CLOBBER_ADDITIONS) -$(RM) -r $(CLOBBER_ADDITIONS)
clean-generic: clean-generic:

7
make/main.cfg
View File

@@ -61,14 +61,9 @@ $(TARGET_VARIANTS)
${ARCH}: ${ARCH}:
test -d ${ARCH} || mkdir ${ARCH} test -d ${ARCH} || mkdir ${ARCH}
# general purpose forcing dependency; try to use .PHONY instead
FORCEIT:
FORCE:
ifndef AUTOMAKE ifndef AUTOMAKE
distclean-generic: distclean-generic:
-$(RM) Makefile .#* $(CONFIG_CLEAN_FILES) -$(RM) .#* $(CONFIG_CLEAN_FILES)
-$(RM) -r $(CLOBBER_ADDITIONS) -$(RM) -r $(CLOBBER_ADDITIONS)
clean-generic: clean-generic: