From 011677f8fc6ce37832e88a65500b7c08e9dba73e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 18 Feb 1999 17:54:03 +0000 Subject: Part of automake VI Patch from Ralf Corsepius . > Adds variables to the custom/*cfg files to specify the location of > tools. The purpose is to remove hard-coded paths from the Makefiles. > > In later steps this eases moving the tools to other locations. --- make/custom/dmv152.cfg | 4 ++-- make/custom/dmv177.cfg | 2 +- make/custom/efi332.cfg | 4 ++-- make/custom/efi68k.cfg | 4 ++-- make/custom/force386.cfg | 4 ++-- make/custom/i386ex.cfg | 4 ++-- make/custom/idp.cfg | 4 ++-- make/custom/mvme136.cfg | 4 ++-- make/custom/mvme147.cfg | 4 ++-- make/custom/mvme162.cfg | 8 ++++++-- make/custom/pc386.cfg | 5 ++++- make/custom/posix.cfg | 2 ++ make/custom/simhppa.cfg | 8 ++++++++ make/host.cfg.in | 3 +++ 14 files changed, 40 insertions(+), 20 deletions(-) (limited to 'make') diff --git a/make/custom/dmv152.cfg b/make/custom/dmv152.cfg index 357a84b21c..13a9586a45 100644 --- a/make/custom/dmv152.cfg +++ b/make/custom/dmv152.cfg @@ -65,7 +65,7 @@ define make-exe $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef @@ -75,7 +75,7 @@ define make-exe $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef diff --git a/make/custom/dmv177.cfg b/make/custom/dmv177.cfg index 49bc0f828a..3e17920ee6 100644 --- a/make/custom/dmv177.cfg +++ b/make/custom/dmv177.cfg @@ -110,7 +110,7 @@ define make-exe $(CC) $(CFLAGS) -o $(basename $@).nxe $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe $(STRIP) $(basename $@).nxe diff --git a/make/custom/efi332.cfg b/make/custom/efi332.cfg index d965545ede..0ccccd00f9 100644 --- a/make/custom/efi332.cfg +++ b/make/custom/efi332.cfg @@ -56,7 +56,7 @@ define make-exe $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef @@ -66,7 +66,7 @@ define make-exe $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef diff --git a/make/custom/efi68k.cfg b/make/custom/efi68k.cfg index 0e84355337..12e6d689dd 100644 --- a/make/custom/efi68k.cfg +++ b/make/custom/efi68k.cfg @@ -56,7 +56,7 @@ define make-exe $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef @@ -66,7 +66,7 @@ define make-exe $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef diff --git a/make/custom/force386.cfg b/make/custom/force386.cfg index 45e4cd80a7..341cf39e84 100644 --- a/make/custom/force386.cfg +++ b/make/custom/force386.cfg @@ -57,7 +57,7 @@ define make-exe $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef @@ -67,7 +67,7 @@ define make-exe $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef diff --git a/make/custom/i386ex.cfg b/make/custom/i386ex.cfg index ececf1ba01..0b33f9160d 100644 --- a/make/custom/i386ex.cfg +++ b/make/custom/i386ex.cfg @@ -58,7 +58,7 @@ define make-exe $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).coff $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).coff > $(basename $@).num $(SIZE) $(basename $@).coff endef @@ -68,7 +68,7 @@ define make-exe $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).coff $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).coff > $(basename $@).num $(SIZE) $(basename $@).coff endef diff --git a/make/custom/idp.cfg b/make/custom/idp.cfg index 0d853906f4..5c1205a878 100644 --- a/make/custom/idp.cfg +++ b/make/custom/idp.cfg @@ -58,7 +58,7 @@ define make-exe $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef @@ -68,7 +68,7 @@ define make-exe $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef diff --git a/make/custom/mvme136.cfg b/make/custom/mvme136.cfg index 8a1ea00bdb..b0b9822e8a 100644 --- a/make/custom/mvme136.cfg +++ b/make/custom/mvme136.cfg @@ -54,7 +54,7 @@ define make-exe $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef @@ -64,7 +64,7 @@ define make-exe $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef diff --git a/make/custom/mvme147.cfg b/make/custom/mvme147.cfg index c63fd9891c..cb788b55b6 100644 --- a/make/custom/mvme147.cfg +++ b/make/custom/mvme147.cfg @@ -51,7 +51,7 @@ define make-exe $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef @@ -61,7 +61,7 @@ define make-exe $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef diff --git a/make/custom/mvme162.cfg b/make/custom/mvme162.cfg index 9141517008..46a3a45a5b 100644 --- a/make/custom/mvme162.cfg +++ b/make/custom/mvme162.cfg @@ -91,7 +91,7 @@ define make-exe --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef @@ -101,9 +101,13 @@ define make-exe $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PROJECT_TOOLS)/packhex > $(basename $@).exe + $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef endif + # Miscellaneous additions go here + +# BSP-specific tools +SLOAD=$(PROJECT_TOOLS)/sload diff --git a/make/custom/pc386.cfg b/make/custom/pc386.cfg index 50689fce06..fb7ef4c6a4 100644 --- a/make/custom/pc386.cfg +++ b/make/custom/pc386.cfg @@ -76,7 +76,7 @@ define make-exe --remove-section=.note \ --strip-unneeded $(basename $@).obj $@ $(OBJCOPY) -O binary $(basename $@).obj $(basename $@).bin - $(PROJECT_TOOLS)/bin2boot -v $(basename $@).bt $(HEADERADDR)\ + $(BIN2BOOT) -v $(basename $@).bt $(HEADERADDR)\ $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0 $(NM) -g -n $(basename $@).obj > $(basename $@).num $(SIZE) $(basename $@).obj @@ -105,3 +105,6 @@ endef endif # Miscellaneous additions go here + +# BSP-specific tools +BIN2BOOT=$(PROJECT_TOOLS)/bin2boot diff --git a/make/custom/posix.cfg b/make/custom/posix.cfg index 720b5a2932..c267192b44 100644 --- a/make/custom/posix.cfg +++ b/make/custom/posix.cfg @@ -35,3 +35,5 @@ NODE=0 endif endif +# BSP-specific tools +GENSIZE=$(PROJECT_RELEASE)/bin/gensize diff --git a/make/custom/simhppa.cfg b/make/custom/simhppa.cfg index 2426ebbae5..425f70de98 100644 --- a/make/custom/simhppa.cfg +++ b/make/custom/simhppa.cfg @@ -132,3 +132,11 @@ endif define make-rel $(LDARGS) $(LD) $(LDFLAGS_INCOMPLETE) $(XLDFLAGS) -o $@ $(OBJS) endef + +# Miscellaneous additions go here + +# BSP-specific tools +PRINTDUMP=$(PROJECT_TOOLS)/print_dump + +# CPU-specific tools +GENOFFSETS=$(PROJECT_RELEASE)/bin/genoffsets diff --git a/make/host.cfg.in b/make/host.cfg.in index 0c8f9cf408..8a9a6c7dde 100644 --- a/make/host.cfg.in +++ b/make/host.cfg.in @@ -30,6 +30,9 @@ CHMOD=@CHMOD@ SED=@SED@ M4=@M4@ +# Global tools +PACKHEX=$(PROJECT_TOOLS)/packhex + INSTALL=$(PROJECT_TOOLS)/install-if-change INSTALL_VARIANT=$(PROJECT_TOOLS)/install-if-change -V "$(LIB_VARIANT)" -- cgit v1.2.3