From 4d1f93e2f3406f14df42fa6ef200ae2a961adb30 Mon Sep 17 00:00:00 2001 From: NicJA Date: Fri, 22 Aug 2008 18:19:57 +0000 Subject: [PATCH] Renamed AROS_SRC/AROS_SRCDIR variable to SRCDIR git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@29227 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- Makefile.in | 84 ++++++++++++++++++++-------------------- configure | 10 ++--- configure.in | 6 +-- tools/MetaMake/Makefile.in | 40 +++++++++---------- tools/collect-aros/Makefile | 2 +- tools/copytoafs/Makefile | 2 +- tools/copytoafs/Makefile.afslib | 2 +- tools/dtdesc/Makefile.aros | 8 ++-- tools/dtdesc/c_iff/Makefile.aros | 2 +- 9 files changed, 78 insertions(+), 78 deletions(-) diff --git a/Makefile.in b/Makefile.in index c1b2de3d8b..4f9ae1b18c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,7 +16,7 @@ export AROS_TARGET_BOOTLOADER := @aros_target_bootloader@ export AROS_GUI_THEME := @aros_target_guitheme@ TOP := @AROS_BUILDDIR@ -AROS_SRC := @AROS_SRCDIR@ +SRCDIR := @SRCDIR@ include $(TOP)/config/make.cfg all: makedirs tools mmake @@ -31,7 +31,7 @@ makedirs: else true ; fi ; \ done @$(IF) [ ! -f $(AROSDIR)/.gdbinit ]; then \ - $(CP) $(AROS_SRC)/_gdbinit $(AROSDIR)/.gdbinit ; \ + $(CP) $(SRCDIR)/_gdbinit $(AROSDIR)/.gdbinit ; \ else true ; fi # Create the tools that are used to build AROS. @@ -40,91 +40,91 @@ tools : makedirs $(TOOLLIB) $(GENMF) $(ARCHTOOL) \ $(COLLECT-AROS) $(AFSLIB) $(COPYTOAFS) \ $(FD2INLINE) $(FD2PRAGMA) $(SFDC) -$(TOOLLIB) : $(wildcard $(AROS_SRC)/tools/toollib/*.[ch]) +$(TOOLLIB) : $(wildcard $(SRCDIR)/tools/toollib/*.[ch]) @$(ECHO) Building toollib... - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/toollib AROS_SRC=$(AROS_SRC) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/toollib SRCDIR=$(SRCDIR) TOP=$(TOP) -$(GENMF) : $(AROS_SRC)/tools/genmf/genmf.py +$(GENMF) : $(SRCDIR)/tools/genmf/genmf.py @$(ECHO) Copying genmf... @./config.status $(subst $(TOP)/,,$(GENMF)) genmf_executable -$(ARCHTOOL) : $(AROS_SRC)/tools/archtools/archtool.c +$(ARCHTOOL) : $(SRCDIR)/tools/archtools/archtool.c @$(ECHO) Building archtool... - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/archtools AROS_SRC=$(AROS_SRC) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/archtools SRCDIR=$(SRCDIR) TOP=$(TOP) -$(FLEXCAT) : $(AROS_SRC)/tools/FlexCat/flexcat.c +$(FLEXCAT) : $(SRCDIR)/tools/FlexCat/flexcat.c @$(ECHO) Building flexcat... - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/FlexCat AROS_SRC=$(AROS_SRC) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/FlexCat SRCDIR=$(SRCDIR) TOP=$(TOP) -$(CREATEDTDESC) : $(wildcard $(AROS_SRC)/tools/dtdesc/*.[ch]) $(wildcard $(AROS_SRC)/tools/dtdesc/c_iff/*.[ch]) +$(CREATEDTDESC) : $(wildcard $(SRCDIR)/tools/dtdesc/*.[ch]) $(wildcard $(SRCDIR)/tools/dtdesc/c_iff/*.[ch]) @$(ECHO) Building createdtdesc... - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/dtdesc -f Makefile.aros AROS_SRC=$(AROS_SRC) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/dtdesc -f Makefile.aros SRCDIR=$(SRCDIR) TOP=$(TOP) -$(AFSLIB) : $(wildcard $(AROS_SRC)/workbench/devs/afs/*.[ch]) +$(AFSLIB) : $(wildcard $(SRCDIR)/workbench/devs/afs/*.[ch]) @$(ECHO) Building afslib... - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/copytoafs -f Makefile.afslib AROS_SRC=$(AROS_SRC) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/copytoafs -f Makefile.afslib SRCDIR=$(SRCDIR) TOP=$(TOP) -$(COPYTOAFS) : $(AFSLIB) $(AROS_SRC)/tools/copytoafs/copytoafs.c +$(COPYTOAFS) : $(AFSLIB) $(SRCDIR)/tools/copytoafs/copytoafs.c @$(ECHO) Building copytoafs... - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/copytoafs AROS_SRC=$(AROS_SRC) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/copytoafs SRCDIR=$(SRCDIR) TOP=$(TOP) -$(ILBMTOC) : $(AROS_SRC)/tools/ilbmtoc/ilbmtoc.c +$(ILBMTOC) : $(SRCDIR)/tools/ilbmtoc/ilbmtoc.c @$(ECHO) Building ilbmtoc... - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/ilbmtoc AROS_SRC=$(AROS_SRC) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/ilbmtoc SRCDIR=$(SRCDIR) TOP=$(TOP) -$(ILBMTOICON) : $(AROS_SRC)/tools/ilbmtoicon/ilbmtoicon.c +$(ILBMTOICON) : $(SRCDIR)/tools/ilbmtoicon/ilbmtoicon.c @$(ECHO) Building ilbmtoicon... - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/ilbmtoicon AROS_SRC=$(AROS_SRC) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/ilbmtoicon SRCDIR=$(SRCDIR) TOP=$(TOP) -$(COLLECT-AROS) : $(wildcard $(AROS_SRC)/tools/collect-aros/*.[hc]) +$(COLLECT-AROS) : $(wildcard $(SRCDIR)/tools/collect-aros/*.[hc]) @$(ECHO) Building collect-aros... - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/collect-aros AROS_SRC=$(AROS_SRC) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/collect-aros SRCDIR=$(SRCDIR) TOP=$(TOP) -$(FD2INLINE) : $(AROS_SRC)/tools/fd2inline/fd2inline.c +$(FD2INLINE) : $(SRCDIR)/tools/fd2inline/fd2inline.c @$(ECHO) Building fd2inline... - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/fd2inline AROS_SRC=$(AROS_SRC) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/fd2inline SRCDIR=$(SRCDIR) TOP=$(TOP) -$(FD2PRAGMA) : $(AROS_SRC)/tools/fd2pragma/fd2pragma.c +$(FD2PRAGMA) : $(SRCDIR)/tools/fd2pragma/fd2pragma.c @$(ECHO) Building fd2pragma... - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/fd2pragma AROS_SRC=$(AROS_SRC) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/fd2pragma SRCDIR=$(SRCDIR) TOP=$(TOP) -$(SFDC) : $(AROS_SRC)/tools/sfdc/*.pl +$(SFDC) : $(SRCDIR)/tools/sfdc/*.pl @$(ECHO) Building sfdc... - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/sfdc AROS_SRC=$(AROS_SRC) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/sfdc SRCDIR=$(SRCDIR) TOP=$(TOP) # MetaMake apparently requires a slighty different compilation. Probably # because it is sort-of an external package as well. mmake : $(TOP)/tools/MetaMake/Makefile $(MMAKE) -$(AROS_SRC)/tools/MetaMake/configure : $(AROS_SRC)/tools/MetaMake/configure.in +$(SRCDIR)/tools/MetaMake/configure : $(SRCDIR)/tools/MetaMake/configure.in @$(ECHO) Building MetaMake... - @cd $(AROS_SRC)/tools/MetaMake && @aros_host_aclocal@ && @aros_host_autoconf@ + @cd $(SRCDIR)/tools/MetaMake && @aros_host_aclocal@ && @aros_host_autoconf@ -$(TOP)/tools/MetaMake/Makefile : $(AROS_SRC)/tools/MetaMake/configure $(AROS_SRC)/tools/MetaMake/Makefile.in +$(TOP)/tools/MetaMake/Makefile : $(SRCDIR)/tools/MetaMake/configure $(SRCDIR)/tools/MetaMake/Makefile.in @$(IF) [ ! -d $(TOP)/tools/MetaMake ]; then \ $(MECHO) $(MKDIR) "$(TOP)/tools/MetaMake" ; \ $(MKDIR) "$(TOP)/tools/MetaMake"; \ fi; - @cd $(TOP)/tools/MetaMake ; CC="$(HOST_CC)" CFLAGS= $(AROS_SRC)/tools/MetaMake/configure --prefix=$(TOOLDIR) --bindir=$(TOOLDIR) --with-objfiledir=$(HOSTGENDIR)/tools/MetaMake + @cd $(TOP)/tools/MetaMake ; CC="$(HOST_CC)" CFLAGS= $(SRCDIR)/tools/MetaMake/configure --prefix=$(TOOLDIR) --bindir=$(TOOLDIR) --with-objfiledir=$(HOSTGENDIR)/tools/MetaMake -$(MMAKE): $(TOP)/tools/MetaMake/Makefile $(wildcard $(AROS_SRC)/tools/MetaMake/*.[ch]) $(GENMF) +$(MMAKE): $(TOP)/tools/MetaMake/Makefile $(wildcard $(SRCDIR)/tools/MetaMake/*.[ch]) $(GENMF) @$(MAKE) $(MKARGS) AUTOHEADER=@aros_host_autoheader@ -C $(TOP)/tools/MetaMake @$(MAKE) $(MKARGS) -C $(TOP)/tools/MetaMake install # Clean the sources and tools clean: @+$(CALL) $(MMAKE) AROS.clean - @$(MAKE) $(MKARGS) -C $(TOP)/tools/MetaMake clean AROS_SRC=$(AROS_SRC) TOP=$(TOP) - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/FlexCat clean AROS_SRC=$(AROS_SRC) TOP=$(TOP) - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/archtools clean AROS_SRC=$(AROS_SRC) TOP=$(TOP) - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/genmf clean - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/toollib clean AROS_SRC=$(AROS_SRC) TOP=$(TOP) - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/dtdesc -f Makefile.aros clean AROS_SRC=$(AROS_SRC) TOP=$(TOP) - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/collect-aros clean AROS_SRC=$(AROS_SRC) TOP=$(TOP) - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/fd2inline clean AROS_SRC=$(AROS_SRC) TOP=$(TOP) - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/fd2pragma clean AROS_SRC=$(AROS_SRC) TOP=$(TOP) - @$(CALL) $(MAKE) $(MKARGS) -C $(AROS_SRC)/tools/sfdc clean AROS_SRC=$(AROS_SRC) TOP=$(TOP) + @$(MAKE) $(MKARGS) -C $(TOP)/tools/MetaMake clean SRCDIR=$(SRCDIR) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/FlexCat clean SRCDIR=$(SRCDIR) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/archtools clean SRCDIR=$(SRCDIR) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/genmf clean + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/toollib clean SRCDIR=$(SRCDIR) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/dtdesc -f Makefile.aros clean SRCDIR=$(SRCDIR) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/collect-aros clean SRCDIR=$(SRCDIR) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/fd2inline clean SRCDIR=$(SRCDIR) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/fd2pragma clean SRCDIR=$(SRCDIR) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/sfdc clean SRCDIR=$(SRCDIR) TOP=$(TOP) -@$(RM) $(ARCHDIR) Makefile config.cache config.status config.log mmake.cache mmake.config rom/mmakefile config/make.cfg $(AROS_DEVELOPMENT)/include/aros/config.h $(GENDIR)/include/aros/config.h $(HOSTGENDIR)/config/host.cfg $(GENDIR)/config/target.cfg $(GENDIR)/config/make.defaults $(GENDIR)/config/specs $(TOOLDIR)/$(AROS_TARGET_CPU)-$(AROS_TARGET_ARCH)$(AROS_TARGET_SUFFIX)-aros-gcc $(TOOLDIR)/$(AROS_TARGET_CPU)-$(AROS_TARGET_ARCH)$(AROS_TARGET_SUFFIX)-aros-ld $(GENDIR)/scripts/genshared $(TOOLDIR)/genmf.py tools/adflib/myconf.aros tools/collect-aros/env.h # Clean the sources and tools diff --git a/configure b/configure index e2d0e20437..64a84f85e4 100755 --- a/configure +++ b/configure @@ -738,7 +738,7 @@ aros_cpu aros_flavour aros_flavour_uc AROS_BUILDDIR -AROS_SRCDIR +SRCDIR AROS_PORTSSRCDIR aros_cc_pre aros_host_arch @@ -2038,9 +2038,9 @@ echo "${ECHO_T}$AROS_BUILDDIR" >&6; } { echo "$as_me:$LINENO: checking AROS Source in .. " >&5 echo $ECHO_N "checking AROS Source in .. ... $ECHO_C" >&6; } srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}` -AROS_SRCDIR=${srcpwd} -{ echo "$as_me:$LINENO: result: $AROS_SRCDIR" >&5 -echo "${ECHO_T}$AROS_SRCDIR" >&6; } +SRCDIR=${srcpwd} +{ echo "$as_me:$LINENO: result: $SRCDIR" >&5 +echo "${ECHO_T}$SRCDIR" >&6; } # Parse the target field into something useful. @@ -13387,7 +13387,7 @@ aros_cpu!$aros_cpu$ac_delim aros_flavour!$aros_flavour$ac_delim aros_flavour_uc!$aros_flavour_uc$ac_delim AROS_BUILDDIR!$AROS_BUILDDIR$ac_delim -AROS_SRCDIR!$AROS_SRCDIR$ac_delim +SRCDIR!$SRCDIR$ac_delim AROS_PORTSSRCDIR!$AROS_PORTSSRCDIR$ac_delim aros_cc_pre!$aros_cc_pre$ac_delim aros_host_arch!$aros_host_arch$ac_delim diff --git a/configure.in b/configure.in index f7de8fbcd1..1c34eb1db8 100644 --- a/configure.in +++ b/configure.in @@ -50,8 +50,8 @@ AC_MSG_RESULT($AROS_BUILDDIR) AC_MSG_CHECKING([AROS Source in .. ]) srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}` -AROS_SRCDIR=${srcpwd} -AC_MSG_RESULT($AROS_SRCDIR) +SRCDIR=${srcpwd} +AC_MSG_RESULT($SRCDIR) # Parse the target field into something useful. changequote(<<,>>) @@ -1541,7 +1541,7 @@ AC_SUBST(aros_cpu) AC_SUBST(aros_flavour) AC_SUBST(aros_flavour_uc) AC_SUBST(AROS_BUILDDIR) -AC_SUBST(AROS_SRCDIR) +AC_SUBST(SRCDIR) AC_SUBST(AROS_PORTSSRCDIR) # Host related diff --git a/tools/MetaMake/Makefile.in b/tools/MetaMake/Makefile.in index e5526443d0..3126ae3201 100644 --- a/tools/MetaMake/Makefile.in +++ b/tools/MetaMake/Makefile.in @@ -9,12 +9,12 @@ EXEEXT = @EXEEXT@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ bindir = @bindir@ -srcdir = @METAMAKE_SRCDIR@ +mmsrcdir = @METAMAKE_SRCDIR@ mmake_LDADD = $(LDADD) mmake_objdir = @mmake_objdir@ DEPDIR = $(mmake_objdir)/.deps mmake_OBJECTS = $(mmake_objdir)/mmake.o $(mmake_objdir)/mem.o $(mmake_objdir)/list.o $(mmake_objdir)/var.o $(mmake_objdir)/dirnode.o $(mmake_objdir)/dep.o $(mmake_objdir)/project.o $(mmake_objdir)/cache.o $(mmake_objdir)/io.o -DEFAULT_INCLUDES = -I.@am__isrc@ +DEFAULT_INCLUDES = -I.$(mmsrcdir) -I.$(SRCDIR) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -28,40 +28,40 @@ makedirs: else true ; fi ; \ done -$(mmake_objdir)/mmake.o: $(srcdir)/mmake.c - $(COMPILE) -MT $(mmake_objdir)/mmake.o -MD -MP -MF $(DEPDIR)/mmake.Tpo -c -o $(mmake_objdir)/mmake.o $(srcdir)/mmake.c +$(mmake_objdir)/mmake.o: $(mmsrcdir)/mmake.c + $(COMPILE) -MT $(mmake_objdir)/mmake.o -MD -MP -MF $(DEPDIR)/mmake.Tpo -c -o $(mmake_objdir)/mmake.o $(mmsrcdir)/mmake.c mv -f $(DEPDIR)/mmake.Tpo $(DEPDIR)/mmake.Po -$(mmake_objdir)/mem.o: $(srcdir)/mem.c - $(COMPILE) -MT $(mmake_objdir)/mem.o -MD -MP -MF $(DEPDIR)/mem.Tpo -c -o $(mmake_objdir)/mem.o $(srcdir)/mem.c +$(mmake_objdir)/mem.o: $(mmsrcdir)/mem.c + $(COMPILE) -MT $(mmake_objdir)/mem.o -MD -MP -MF $(DEPDIR)/mem.Tpo -c -o $(mmake_objdir)/mem.o $(mmsrcdir)/mem.c mv -f $(DEPDIR)/mem.Tpo $(DEPDIR)/mem.Po -$(mmake_objdir)/list.o: $(srcdir)/list.c - $(COMPILE) -MT $(mmake_objdir)/list.o -MD -MP -MF $(DEPDIR)/list.Tpo -c -o $(mmake_objdir)/list.o $(srcdir)/list.c +$(mmake_objdir)/list.o: $(mmsrcdir)/list.c + $(COMPILE) -MT $(mmake_objdir)/list.o -MD -MP -MF $(DEPDIR)/list.Tpo -c -o $(mmake_objdir)/list.o $(mmsrcdir)/list.c mv -f $(DEPDIR)/list.Tpo $(DEPDIR)/list.Po -$(mmake_objdir)/var.o: $(srcdir)/var.c - $(COMPILE) -MT $(mmake_objdir)/var.o -MD -MP -MF $(DEPDIR)/var.Tpo -c -o $(mmake_objdir)/var.o $(srcdir)/var.c +$(mmake_objdir)/var.o: $(mmsrcdir)/var.c + $(COMPILE) -MT $(mmake_objdir)/var.o -MD -MP -MF $(DEPDIR)/var.Tpo -c -o $(mmake_objdir)/var.o $(mmsrcdir)/var.c mv -f $(DEPDIR)/var.Tpo $(DEPDIR)/var.Po -$(mmake_objdir)/dirnode.o: $(srcdir)/dirnode.c - $(COMPILE) -MT $(mmake_objdir)/dirnode.o -MD -MP -MF $(DEPDIR)/dirnode.Tpo -c -o $(mmake_objdir)/dirnode.o $(srcdir)/dirnode.c +$(mmake_objdir)/dirnode.o: $(mmsrcdir)/dirnode.c + $(COMPILE) -MT $(mmake_objdir)/dirnode.o -MD -MP -MF $(DEPDIR)/dirnode.Tpo -c -o $(mmake_objdir)/dirnode.o $(mmsrcdir)/dirnode.c mv -f $(DEPDIR)/dirnode.Tpo $(DEPDIR)/dirnode.Po -$(mmake_objdir)/dep.o: $(srcdir)/dep.c - $(COMPILE) -MT $(mmake_objdir)/dep.o -MD -MP -MF $(DEPDIR)/dep.Tpo -c -o $(mmake_objdir)/dep.o $(srcdir)/dep.c +$(mmake_objdir)/dep.o: $(mmsrcdir)/dep.c + $(COMPILE) -MT $(mmake_objdir)/dep.o -MD -MP -MF $(DEPDIR)/dep.Tpo -c -o $(mmake_objdir)/dep.o $(mmsrcdir)/dep.c mv -f $(DEPDIR)/dep.Tpo $(DEPDIR)/dep.Po -$(mmake_objdir)/project.o: $(srcdir)/project.c - $(COMPILE) -MT $(mmake_objdir)/project.o -MD -MP -MF $(DEPDIR)/project.Tpo -c -o $(mmake_objdir)/project.o $(srcdir)/project.c +$(mmake_objdir)/project.o: $(mmsrcdir)/project.c + $(COMPILE) -MT $(mmake_objdir)/project.o -MD -MP -MF $(DEPDIR)/project.Tpo -c -o $(mmake_objdir)/project.o $(mmsrcdir)/project.c mv -f $(DEPDIR)/project.Tpo $(DEPDIR)/project.Po -$(mmake_objdir)/cache.o: $(srcdir)/cache.c - $(COMPILE) -MT $(mmake_objdir)/cache.o -MD -MP -MF $(DEPDIR)/cache.Tpo -c -o $(mmake_objdir)/cache.o $(srcdir)/cache.c +$(mmake_objdir)/cache.o: $(mmsrcdir)/cache.c + $(COMPILE) -MT $(mmake_objdir)/cache.o -MD -MP -MF $(DEPDIR)/cache.Tpo -c -o $(mmake_objdir)/cache.o $(mmsrcdir)/cache.c mv -f $(DEPDIR)/cache.Tpo $(DEPDIR)/cache.Po -$(mmake_objdir)/io.o: $(srcdir)/io.c - $(COMPILE) -MT $(mmake_objdir)/io.o -MD -MP -MF $(DEPDIR)/io.Tpo -c -o $(mmake_objdir)/io.o $(srcdir)/io.c +$(mmake_objdir)/io.o: $(mmsrcdir)/io.c + $(COMPILE) -MT $(mmake_objdir)/io.o -MD -MP -MF $(DEPDIR)/io.Tpo -c -o $(mmake_objdir)/io.o $(mmsrcdir)/io.c mv -f $(DEPDIR)/io.Tpo $(DEPDIR)/io.Po $(mmake_objdir)/mmake$(EXEEXT): $(mmake_OBJECTS) diff --git a/tools/collect-aros/Makefile b/tools/collect-aros/Makefile index feb841cd4e..5fdc2c3901 100644 --- a/tools/collect-aros/Makefile +++ b/tools/collect-aros/Makefile @@ -13,7 +13,7 @@ COLLECT-AROS ?= collect-aros RM ?= rm COLLECT-AROS-BACKEND ?= backend-generic.c COLLECT-AROS-DOCOMMAND ?= docommand-exec.c -ifneq ($(AROS_SRC),) +ifneq ($(SRCDIR),) COLLECT-AROS-DIR := $(TOP)/tools/collect-aros else COLLECT-AROS-DIR := . diff --git a/tools/copytoafs/Makefile b/tools/copytoafs/Makefile index fb065c064c..aaec69bf2d 100644 --- a/tools/copytoafs/Makefile +++ b/tools/copytoafs/Makefile @@ -6,7 +6,7 @@ DEBUG_OPTS := -g -DDEBUG=0 FILES := copytoafs -AFSSRCDIR := $(AROS_SRC)/rom/devs/filesys/afs +AFSSRCDIR := $(SRCDIR)/rom/devs/filesys/afs ifneq ($(HOSTGENDIR),) OBJDIR := $(HOSTGENDIR)/tools/host_copytoafs else diff --git a/tools/copytoafs/Makefile.afslib b/tools/copytoafs/Makefile.afslib index 640a9097f4..db5ea6a26f 100644 --- a/tools/copytoafs/Makefile.afslib +++ b/tools/copytoafs/Makefile.afslib @@ -18,7 +18,7 @@ FILES := \ volumes \ validator -AFSSRCDIR := $(AROS_SRC)/rom/devs/filesys/afs +AFSSRCDIR := $(SRCDIR)/rom/devs/filesys/afs ifneq ($(HOSTGENDIR),) OBJDIR := $(HOSTGENDIR)/tools/host_afs else diff --git a/tools/dtdesc/Makefile.aros b/tools/dtdesc/Makefile.aros index 48bc4cbc08..31af49758c 100644 --- a/tools/dtdesc/Makefile.aros +++ b/tools/dtdesc/Makefile.aros @@ -15,8 +15,8 @@ HOST_CC ?= $(CC) HOST_CFLAGS ?= -Wall -g -O TOOLDIR ?= . ifneq ($(HOSTGENDIR),) -OBJDIR := $(HOSTGENDIR)/$(subst $(AROS_SRC)/,,$(CURDIR)) -CIFFSRCDIR := $(AROS_SRC)/tools/dtdesc/c_iff +OBJDIR := $(HOSTGENDIR)/$(subst $(SRCDIR)/,,$(CURDIR)) +CIFFSRCDIR := $(SRCDIR)/tools/dtdesc/c_iff CIFFLIBDIR := $(TOOLDIR) else OBJDIR := $(TOOLDIR)/obj @@ -46,12 +46,12 @@ $(OBJDIR)/%.o : %.c $(CIFFLIBDIR)/libc_iff.a: @$(ECHO) Building libc_iff.a... - @$(CALL) $(MAKE) $(MKARGS) -C $(CIFFSRCDIR) -f Makefile.aros AROS_SRC=$(AROS_SRC) TOP=$(TOP) + @$(CALL) $(MAKE) $(MKARGS) -C $(CIFFSRCDIR) -f Makefile.aros SRCDIR=$(SRCDIR) TOP=$(TOP) $(OBJDIR): @$(MKDIR) $(OBJDIR) clean: - @$(MAKE) $(MKARGS) -C $(CIFFSRCDIR) -f Makefile.aros AROS_SRC=$(AROS_SRC) TOP=$(TOP) clean + @$(MAKE) $(MKARGS) -C $(CIFFSRCDIR) -f Makefile.aros SRCDIR=$(SRCDIR) TOP=$(TOP) clean @$(RM) -f *.o examinedtdesc $(CREATEDTDESC) $(OBJDIR) diff --git a/tools/dtdesc/c_iff/Makefile.aros b/tools/dtdesc/c_iff/Makefile.aros index 0e8bde4b3c..de8211ff8e 100644 --- a/tools/dtdesc/c_iff/Makefile.aros +++ b/tools/dtdesc/c_iff/Makefile.aros @@ -27,7 +27,7 @@ HOST_CC ?= $(CC) HOST_AR ?= $(AR) cru TOOLDIR ?= . ifneq ($(HOSTGENDIR),) -OBJDIR=$(HOSTGENDIR)/$(subst $(AROS_SRC)/,,$(CURDIR)) +OBJDIR=$(HOSTGENDIR)/$(subst $(SRCDIR)/,,$(CURDIR)) CIFFSRCDIR=$(CURDIR) CIFFLIBDIR=$(HOSTDIR)/lib else -- 2.11.4.GIT