diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-30 02:15:25 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-30 02:15:25 +0000 |
| commit | 1a819ee56d8cdb229ba01b06349e24e6e02b69cc (patch) | |
| tree | 925a2f1c887fbbb393a85e7638c92818801e8618 /c | |
| parent | 2003-12-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-1a819ee56d8cdb229ba01b06349e24e6e02b69cc.tar.bz2 | |
2003-12-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* console/Makefile.am: Eliminate *.rel.
Use $(top_srcdir)/../../shared instead of ../../../shared.
* startup/Makefile.am: Cosmetics.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/psim/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/psim/console/Makefile.am | 20 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/psim/startup/Makefile.am | 6 |
3 files changed, 15 insertions, 17 deletions
diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index 2a7b1d8244..baacc9db79 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog @@ -1,3 +1,9 @@ +2003-12-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * console/Makefile.am: Eliminate *.rel. + Use $(top_srcdir)/../../shared instead of ../../../shared. + * startup/Makefile.am: Cosmetics. + 2003-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * clock/Makefile.am: Eliminate VPATH. diff --git a/c/src/lib/libbsp/powerpc/psim/console/Makefile.am b/c/src/lib/libbsp/powerpc/psim/console/Makefile.am index 42ae9ce220..244e4c6d11 100644 --- a/c/src/lib/libbsp/powerpc/psim/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/console/Makefile.am @@ -2,29 +2,23 @@ ## $Id$ ## -PGM = $(ARCH)/console.rel +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am C_FILES = console-io.c OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -shared_C_FILES = ../../../shared/console-polled.c -OBJS += $(shared_C_FILES:../../../shared/%.c=$(ARCH)/%.$(OBJEXT)) +shared_C_FILES = $(top_srcdir)/../../shared/console-polled.c +OBJS += \ + $(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT)) S_FILES = consupp.S OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../../../shared/%.c $(ARCH)/$(dirstamp) +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp) ${COMPILE} -o $@ -c $< -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(PGM) +noinst_DATA = $(OBJS) EXTRA_DIST = $(C_FILES) $(S_FILES) diff --git a/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am b/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am index 70d187fa69..8a34e6b320 100644 --- a/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## - - PGM = $(ARCH)/startup.rel C_FILES = bspclean.c bspstart.c setvec.c @@ -18,12 +16,12 @@ shared_C_FILES += $(top_srcdir)/../../shared/bsppost.c shared_C_FILES += $(top_srcdir)/../../shared/main.c shared_C_FILES += $(top_srcdir)/../../shared/sbrk.c shared_C_FILES += $(top_srcdir)/../../shared/gnatinstallhandler.c -OBJS += $(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT)) +OBJS += \ + $(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT)) $(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp) ${COMPILE} -o $@ -c $< - $(PGM): $(OBJS) $(make-rel) |