From 041865c320ea1cf1b882bd3c16013c349aa8b093 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 24 Jun 2004 18:56:12 +0000 Subject: [PATCH] Misc cleanups. committer: mfx 1088103372 +0000 --- src/.cvsignore | 1 + src/Makefile.bld | 4 +++- src/stub/.cvsignore | 1 + src/stub/Makefile | 13 +++++++++---- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/.cvsignore b/src/.cvsignore index 7c738769..0f7a8de6 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -1,5 +1,6 @@ GNUmakefile *.0?? +*.d *.dat *.idb *.img diff --git a/src/Makefile.bld b/src/Makefile.bld index 1285f0be..046d11ef 100644 --- a/src/Makefile.bld +++ b/src/Makefile.bld @@ -204,6 +204,7 @@ DEPMODE := linux-intelc CC = icc CXX = icpc CCARCH += -march=i386 -mcpu=i686 -nolib_inline +DEFS += -D_FILE_OFFSET_BITS=64 CFLAGS_OUTPUT = -o $@ LINK_EXE_OUTPUT = -o $@ ifeq ($(WITH_ZLIB),1) @@ -228,6 +229,7 @@ DEPMODE := linux-pgi CC = pgcc CXX = pgCC CCARCH += -tp=p6 +DEFS += -D_FILE_OFFSET_BITS=64 CFLAGS_OUTPUT = -o $@ LINK_EXE_OUTPUT = -o $@ ifeq ($(WITH_ZLIB),1) @@ -683,7 +685,7 @@ $(upx_exe): $(OBJECTS) $(LIBS) $(RESOURCES) $(strip $(CHMOD_EXE)) mostlyclean: - -rm -f *.d *.err *.i *.log *.map *~ gdb-trans* + -rm -f *.d *.err *.i *.log *.map gdb-trans* clean: mostlyclean -rm -f *.a *.lib *.o *.obj *.res *.tds tags TAGS ID diff --git a/src/stub/.cvsignore b/src/stub/.cvsignore index 7dc226b0..b9acac34 100644 --- a/src/stub/.cvsignore +++ b/src/stub/.cvsignore @@ -1,6 +1,7 @@ *.asx *.asy *.bin +*.d *.i *.lst *.map diff --git a/src/stub/Makefile b/src/stub/Makefile index 48a98857..ee6972b2 100644 --- a/src/stub/Makefile +++ b/src/stub/Makefile @@ -91,17 +91,17 @@ LD_LINUX_I386 = ld OBJCOPY_LINUX_I386 = objcopy # gcc 2.7.2.3 (fold_*.bin: 1718 / 1011 / 1340) -CC_LINUX_I386_GCC272 = gcc-2.72 -m386 -O2 +CC_LINUX_I386_GCC272 = gcc-2.72 -m386 -O2 -MMD CC_LINUX_I386_GCC272 += -malign-functions=0 -malign-jumps=0 -malign-loops=0 # gcc 2.95.3 (fold_*.bin: 1618 / 995 / 1305) -CC_LINUX_I386_GCC295 = gcc-2.95 -march=i386 -mcpu=k6 -fno-exceptions +CC_LINUX_I386_GCC295 = gcc-2.95 -march=i386 -mcpu=k6 -fno-exceptions -MMD CC_LINUX_I386_GCC295 += -Os -fno-omit-frame-pointer CC_LINUX_I386_GCC295 += -malign-functions=0 -malign-jumps=0 -malign-loops=0 CC_LINUX_I386_GCC295 += -Werror # gcc 3.4.0 (fold_*.bin: 1482 / 931 / 1173) -CC_LINUX_I386_GCC340 = gcc-3.4 -march=i386 -mtune=k6 -fno-exceptions +CC_LINUX_I386_GCC340 = gcc-3.4 -march=i386 -mtune=k6 -fno-exceptions -MMD CC_LINUX_I386_GCC340 += -Os -fno-omit-frame-pointer CC_LINUX_I386_GCC340 += -momit-leaf-frame-pointer CC_LINUX_I386_GCC340 += -fno-align-functions -fno-align-jumps -fno-align-labels -fno-align-loops @@ -158,7 +158,7 @@ stubs: $(STUBS) mostlyclean: - -rm -f *~ *.bin *.bkp *.i *.lst *.map stubify.exe + -rm -f *.bin *.bkp *.d *.i *.lst *.map stubify.exe -rm -f *.o *.asx *.asy clean: mostlyclean @@ -407,6 +407,11 @@ upxd: l_lx_sep.o l_lx_sep86.asm # // dependencies # ************************************************************************/ +DEPS_FILES := $(wildcard *.d) +ifneq ($(strip $(DEPS_FILES)),) + include $(DEPS_FILES) +endif + DEPS1 = header.ash macros.ash ident.ash ident_n.ash ident_s.ash DEPS2 = header.asy macros.asy DEPS3 = n2b_d32.asy n2d_d32.asy n2e_d32.asy