diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-04-24 15:46:10 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-04-24 15:46:10 +0000 |
| commit | 4f5a5985a9f84070d475a4ab782545ca5c8d05c8 (patch) | |
| tree | 5b5f52c3d85f5c62e847f515a20c0bfc32bbade2 | |
| parent | 2006-04-20 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-4f5a5985a9f84070d475a4ab782545ca5c8d05c8.tar.bz2 | |
2006-04-24 Joel Sherrill <joel@OARcorp.com>
* startup/Makefile.am:
| -rw-r--r-- | c/src/lib/libbsp/unix/posix/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/unix/posix/startup/Makefile.am | 28 |
2 files changed, 19 insertions, 13 deletions
diff --git a/c/src/lib/libbsp/unix/posix/ChangeLog b/c/src/lib/libbsp/unix/posix/ChangeLog index 0a294553f1..1bfd53ded8 100644 --- a/c/src/lib/libbsp/unix/posix/ChangeLog +++ b/c/src/lib/libbsp/unix/posix/ChangeLog @@ -1,3 +1,7 @@ +2006-04-24 Joel Sherrill <joel@OARcorp.com> + + * startup/Makefile.am: + 2003-09-04 Joel Sherrill <joel@OARcorp.com> * clock/clock.c, console/console.c, include/bsp.h, shmsupp/addrconv.c, diff --git a/c/src/lib/libbsp/unix/posix/startup/Makefile.am b/c/src/lib/libbsp/unix/posix/startup/Makefile.am index 76553abfcb..f2489f4953 100644 --- a/c/src/lib/libbsp/unix/posix/startup/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/startup/Makefile.am @@ -7,8 +7,9 @@ VPATH = @srcdir@:@srcdir@/../../../shared PGM = ${ARCH}/startup.rel +### really should use startup/rtems-ctor.cc when C++ if HAS_CXX -C_MAIN_C_FILES = +C_MAIN_C_FILES = main.c else C_MAIN_C_FILES = main.c endif @@ -19,7 +20,8 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) startup_rel_OBJECTS = $(C_O_FILES) # CC sources -CC_FILES = rtems-ctor.cc +## CC_FILES = rtems-ctor.cc +CC_FILES = CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.$(OBJEXT)} # We install the RTEMS constructor as a separate .$(OBJEXT) @@ -37,21 +39,21 @@ AM_CFLAGS += $(LIBC_DEFINES) $(PGM): $(startup_rel_OBJECTS) $(make-rel) -${ARCH}/libno-ctor.a: $(ARCH)/no-ctor.$(OBJEXT) - $(AR) -cvr $@ $< +#${ARCH}/libno-ctor.a: $(ARCH)/no-ctor.$(OBJEXT) +# $(AR) -cvr $@ $< -$(PROJECT_RELEASE)/lib/libno-ctor$(LIB_VARIANT).a: ${ARCH}/libno-ctor.a - $(INSTALL_DATA) $< $@ +#$(PROJECT_RELEASE)/lib/libno-ctor$(LIB_VARIANT).a: ${ARCH}/libno-ctor.a +# $(INSTALL_DATA) $< $@ -$(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT): $(ARCH)/rtems-ctor.$(OBJEXT) - $(INSTALL_DATA) $< $@ +#$(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT): $(ARCH)/rtems-ctor.$(OBJEXT) +# $(INSTALL_DATA) $< $@ -if HAS_CXX -all-local: $(ARCH) $(PGM) $(PROJECT_RELEASE)/lib/libno-ctor$(LIB_VARIANT).a \ - $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT) -else +#if HAS_CXX +#all-local: $(ARCH) $(PGM) $(PROJECT_RELEASE)/lib/libno-ctor$(LIB_VARIANT).a \ +# $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT) +#else all-local: $(ARCH) $(PGM) -endif +#endif EXTRA_DIST = bspclean.c bspstart.c exit.c main.c no-ctor.c rtems-ctor.cc \ setvec.c |