From a2fa173090a9e093d05e7513011dcdbae7893152 Mon Sep 17 00:00:00 2001 From: smf- Date: Mon, 11 Jun 2012 18:11:48 +0000 Subject: [PATCH] stop repeated make all runs from toggling between building chdman & mame due to both being dependent on version.o, which is always recreated when either exe is built. --- makefile | 4 ++-- src/tools/tools.mak | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index 9579bdf1a2f..b4124c6c696 100644 --- a/makefile +++ b/makefile @@ -758,10 +758,10 @@ $(sort $(OBJDIRS)): ifndef EXECUTABLE_DEFINED -$(EMULATOR): $(VERSIONOBJ) $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBCPU) $(LIBEMU) $(LIBDASM) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(7Z_LIB) $(FORMATS_LIB) $(ZLIB) $(LIBOCORE) $(RESFILE) +$(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBCPU) $(LIBEMU) $(LIBDASM) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(7Z_LIB) $(FORMATS_LIB) $(ZLIB) $(LIBOCORE) $(RESFILE) $(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ) @echo Linking $@... - $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@ + $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(VERSIONOBJ) $(LIBS) -o $@ ifeq ($(TARGETOS),win32) ifdef SYMBOLS ifndef MSVC_BUILD diff --git a/src/tools/tools.mak b/src/tools/tools.mak index a8504e78e8a..105fc33678e 100644 --- a/src/tools/tools.mak +++ b/src/tools/tools.mak @@ -84,10 +84,10 @@ romcmp$(EXE): $(ROMCMPOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(LIBOCORE) CHDMANOBJS = \ $(TOOLSOBJ)/chdman.o \ -chdman$(EXE): $(VERSIONOBJ) $(CHDMANOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(FLAC_LIB) $(7Z_LIB) $(LIBOCORE) +chdman$(EXE): $(CHDMANOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(FLAC_LIB) $(7Z_LIB) $(LIBOCORE) $(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ) @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) $(FLAC_LIB) -o $@ + $(LD) $(LDFLAGS) $(VERSIONOBJ) $^ $(LIBS) $(FLAC_LIB) -o $@