2007-07-31 Joel Sherrill <joel.sherrill@OARcorp.com>

* Makefile.am, preinstall.am: You need main() to link all applications.
	There is no C++ specific way to link currently.
This commit is contained in:
Joel Sherrill
2007-08-01 00:49:03 +00:00
parent 51b6226c25
commit eec7c441d7
3 changed files with 17 additions and 11 deletions

View File

@@ -1,3 +1,8 @@
2007-07-31 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am, preinstall.am: You need main() to link all applications.
There is no C++ specific way to link currently.
2007-07-24 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-07-24 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am, startup/main.c: Now can link with C compiler and not * Makefile.am, startup/main.c: Now can link with C compiler and not

View File

@@ -42,9 +42,10 @@ noinst_LIBRARIES =
noinst_PROGRAMS += startup.rel noinst_PROGRAMS += startup.rel
startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
startup/bspstart.c startup/setvec.c ../../shared/bootcard.c startup/bspstart.c startup/setvec.c ../../shared/bootcard.c
if !HAS_CXX ## for now always using main.c style startup
##if !HAS_CXX
startup_rel_SOURCES += startup/main.c startup_rel_SOURCES += startup/main.c
endif ##endif
startup_rel_CPPFLAGS = $(AM_CPPFLAGS) startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)

View File

@@ -48,12 +48,12 @@ $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
if HAS_CXX ##if HAS_CXX
$(PROJECT_LIB)/no-ctor.$(OBJEXT): no-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) ##$(PROJECT_LIB)/no-ctor.$(OBJEXT): no-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/no-ctor.$(OBJEXT) ## $(INSTALL_DATA) $< $(PROJECT_LIB)/no-ctor.$(OBJEXT)
TMPINSTALL_FILES += $(PROJECT_LIB)/no-ctor.$(OBJEXT) ##TMPINSTALL_FILES += $(PROJECT_LIB)/no-ctor.$(OBJEXT)
##
$(PROJECT_LIB)/rtems-ctor.$(OBJEXT): rtems-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) ##$(PROJECT_LIB)/rtems-ctor.$(OBJEXT): rtems-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems-ctor.$(OBJEXT) ## $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems-ctor.$(OBJEXT)
TMPINSTALL_FILES += $(PROJECT_LIB)/rtems-ctor.$(OBJEXT) ##TMPINSTALL_FILES += $(PROJECT_LIB)/rtems-ctor.$(OBJEXT)
endif ##endif