summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--c/src/exec/rtems/include/rtems/rtems/Makefile.am2
-rw-r--r--c/src/exec/rtems/optman/Makefile.am2
-rw-r--r--c/src/exec/sapi/optman/Makefile.am2
-rw-r--r--c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in4
-rw-r--r--c/src/make/host.cfg.in6
-rw-r--r--c/src/optman/rtems/Makefile.am2
-rw-r--r--c/src/optman/sapi/Makefile.am2
-rw-r--r--make/custom/gen68360.cfg6
-rw-r--r--make/custom/gensh1.cfg6
-rw-r--r--make/custom/gensh2.cfg6
-rw-r--r--make/host.cfg.in6
12 files changed, 32 insertions, 16 deletions
diff --git a/c/src/exec/rtems/include/rtems/rtems/Makefile.am b/c/src/exec/rtems/include/rtems/rtems/Makefile.am
index cbd214e1aa..b27c67a0e5 100644
--- a/c/src/exec/rtems/include/rtems/rtems/Makefile.am
+++ b/c/src/exec/rtems/include/rtems/rtems/Makefile.am
@@ -13,7 +13,7 @@ STD_H_FILES = asr.h attr.h clock.h config.h dpmem.h event.h eventset.h intr.h \
signal.h status.h support.h tasks.h timer.h types.h
if HAS_MP
-H_FILES = $(STD_HFILES) $(MP_H_FILES)
+H_FILES = $(STD_H_FILES) $(MP_H_FILES)
else
H_FILES = $(STD_H_FILES)
endif
diff --git a/c/src/exec/rtems/optman/Makefile.am b/c/src/exec/rtems/optman/Makefile.am
index 163bd86c97..d85aef17ad 100644
--- a/c/src/exec/rtems/optman/Makefile.am
+++ b/c/src/exec/rtems/optman/Makefile.am
@@ -33,7 +33,7 @@ $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
AM_CFLAGS += $(CFLAGS_OS_V)
ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
-all: ${ARCH} $(TMPINSTALL_FILES)
+all: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
EXTRA_DIST = $(C_FILES)
diff --git a/c/src/exec/sapi/optman/Makefile.am b/c/src/exec/sapi/optman/Makefile.am
index 34b23d5f6c..96254065ea 100644
--- a/c/src/exec/sapi/optman/Makefile.am
+++ b/c/src/exec/sapi/optman/Makefile.am
@@ -32,7 +32,7 @@ $(PROJECT_RELEASE)/lib:
$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
$(INSTALL_DATA) $< $@
-all: ${ARCH} $(TMPINSTALL_FILES)
+all: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
EXTRA_DIST = $(C_FILES)
diff --git a/c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in
index 15f3d8ddfa..8a43068b83 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in
@@ -20,10 +20,12 @@ NETWORK = $(NETWORK_$(HAS_NETWORKING)_V)
BSP_PIECES = clock console irq openpic pci residual startup $(NETWORK) \
vectors
GENERIC_PIECES =
+CPU_PIECES = clock
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) $(foreach \
- piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o)
+ piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o) $(foreach
+ piece, $(CPU_PIECES), ../../../../libcpu/powerpc/mpc750/$(piece)/$(ARCH)/*.o)
LIB = $(ARCH)/libbsp.a
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in
index 15f3d8ddfa..8a43068b83 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in
@@ -20,10 +20,12 @@ NETWORK = $(NETWORK_$(HAS_NETWORKING)_V)
BSP_PIECES = clock console irq openpic pci residual startup $(NETWORK) \
vectors
GENERIC_PIECES =
+CPU_PIECES = clock
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) $(foreach \
- piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o)
+ piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o) $(foreach
+ piece, $(CPU_PIECES), ../../../../libcpu/powerpc/mpc750/$(piece)/$(ARCH)/*.o)
LIB = $(ARCH)/libbsp.a
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
diff --git a/c/src/make/host.cfg.in b/c/src/make/host.cfg.in
index c048042977..cae07de613 100644
--- a/c/src/make/host.cfg.in
+++ b/c/src/make/host.cfg.in
@@ -30,9 +30,13 @@ SED=sed
# M4=@M4@
# Global tools
+ifndef PACKHEX
PACKHEX=$(PROJECT_BIN)/packhex
+endif
+ifndef INSTALL_CHANGE
INSTALL_CHANGE=$(PROJECT_BIN)/install-if-change
+endif
INSTALL_VARIANT=$(INSTALL_CHANGE) -V "$(LIB_VARIANT)"
# FIXME: HACK for a bug in cygwin-hosted egcs which returns a mixture
@@ -71,4 +75,6 @@ INSTLIBFLAGS = -m 0644
INSTDIRFLAGS = -m 0755 -d
INSTINCFLAGS = -m 0644
+ifndef INSTALL_DATA
INSTALL_DATA = $(INSTALL) $(INSTDATAFLAGS)
+endif
diff --git a/c/src/optman/rtems/Makefile.am b/c/src/optman/rtems/Makefile.am
index 163bd86c97..d85aef17ad 100644
--- a/c/src/optman/rtems/Makefile.am
+++ b/c/src/optman/rtems/Makefile.am
@@ -33,7 +33,7 @@ $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
AM_CFLAGS += $(CFLAGS_OS_V)
ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
-all: ${ARCH} $(TMPINSTALL_FILES)
+all: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
EXTRA_DIST = $(C_FILES)
diff --git a/c/src/optman/sapi/Makefile.am b/c/src/optman/sapi/Makefile.am
index 34b23d5f6c..96254065ea 100644
--- a/c/src/optman/sapi/Makefile.am
+++ b/c/src/optman/sapi/Makefile.am
@@ -32,7 +32,7 @@ $(PROJECT_RELEASE)/lib:
$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
$(INSTALL_DATA) $< $@
-all: ${ARCH} $(TMPINSTALL_FILES)
+all: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
EXTRA_DIST = $(C_FILES)
diff --git a/make/custom/gen68360.cfg b/make/custom/gen68360.cfg
index c78a4b5743..75defe32b8 100644
--- a/make/custom/gen68360.cfg
+++ b/make/custom/gen68360.cfg
@@ -79,10 +79,10 @@ endef
else
define make-exe
- $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -o $(basename $@).exe \
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -o $@ \
$(LINK_OBJS) $(LINK_LIBS)
- $(NM) -g -n $(basename $@).exe > $(basename $@).num
- $(SIZE) $(basename $@).exe
+ $(NM) -g -n $@ > $(basename $@).num
+ $(SIZE) $@
endef
endif
diff --git a/make/custom/gensh1.cfg b/make/custom/gensh1.cfg
index f4145d2609..1b52be1c2a 100644
--- a/make/custom/gensh1.cfg
+++ b/make/custom/gensh1.cfg
@@ -72,10 +72,10 @@ endef
else
define make-exe
$(LINK.c) -Wl,-Map,$(basename $@).map \
- $(LDLIBS) -o $(basename $@).exe \
+ $(LDLIBS) -o $@ \
$(LINK_OBJS) $(LINK_LIBS)
- $(NM) -n $(basename $@).exe > $(basename $@).num
- $(SIZE) $(basename $@).exe
+ $(NM) -n $@ > $(basename $@).num
+ $(SIZE) $@
endef
endif
diff --git a/make/custom/gensh2.cfg b/make/custom/gensh2.cfg
index a03f7a950c..f4596f26a1 100644
--- a/make/custom/gensh2.cfg
+++ b/make/custom/gensh2.cfg
@@ -76,10 +76,10 @@ endef
else
define make-exe
$(LINK.c) -Wl,-Map,$(basename $@).map \
- $(LDLIBS) -o $(basename $@).exe \
+ $(LDLIBS) -o $@ \
$(LINK_OBJS) $(LINK_LIBS)
- $(NM) -n $(basename $@).exe > $(basename $@).num
- $(SIZE) $(basename $@).exe
+ $(NM) -n $@ > $(basename $@).num
+ $(SIZE) $@
endef
endif
diff --git a/make/host.cfg.in b/make/host.cfg.in
index c048042977..cae07de613 100644
--- a/make/host.cfg.in
+++ b/make/host.cfg.in
@@ -30,9 +30,13 @@ SED=sed
# M4=@M4@
# Global tools
+ifndef PACKHEX
PACKHEX=$(PROJECT_BIN)/packhex
+endif
+ifndef INSTALL_CHANGE
INSTALL_CHANGE=$(PROJECT_BIN)/install-if-change
+endif
INSTALL_VARIANT=$(INSTALL_CHANGE) -V "$(LIB_VARIANT)"
# FIXME: HACK for a bug in cygwin-hosted egcs which returns a mixture
@@ -71,4 +75,6 @@ INSTLIBFLAGS = -m 0644
INSTDIRFLAGS = -m 0755 -d
INSTINCFLAGS = -m 0644
+ifndef INSTALL_DATA
INSTALL_DATA = $(INSTALL) $(INSTDATAFLAGS)
+endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 14:53:45 +0000