From: Julian Seward Date: Tue, 27 Jul 2004 10:54:21 +0000 (+0000) Subject: Track file renaming. X-Git-Tag: svn/VALGRIND_3_0_1^2~1194 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d6c8f2ea6eb841bb52f378bed319d74719049b6;p=thirdparty%2Fvalgrind.git Track file renaming. git-svn-id: svn://svn.valgrind.org/vex/trunk@140 --- diff --git a/VEX/Makefile-icc b/VEX/Makefile-icc index 720a4cf9eb..918f79043c 100644 --- a/VEX/Makefile-icc +++ b/VEX/Makefile-icc @@ -3,37 +3,37 @@ PUB_HEADERS = pub/libvex_basictypes.h \ pub/libvex_ir.h \ pub/libvex.h -PRIV_HEADERS = priv/host-x86/x86host_defs.h \ - priv/host-generic/host_regs.h \ +PRIV_HEADERS = priv/host-x86/hdefs.h \ + priv/host-generic/h_generic_regs.h \ priv/main/vex_globals.h \ priv/main/vex_util.h \ - priv/guest-x86/x86guest_defs.h + priv/guest-x86/gdefs.h -LIB_OBJS = priv/ir/ir_defs.o \ +LIB_OBJS = priv/ir/irdefs.o \ priv/main/vex_main.o \ priv/main/vex_globals.o \ priv/main/vex_util.o \ - priv/host-x86/x86host_defs.o \ - priv/host-x86/isel_x86.o \ - priv/host-generic/host_regs.o \ + priv/host-x86/hdefs.o \ + priv/host-x86/isel.o \ + priv/host-generic/h_generic_regs.o \ priv/host-generic/reg_alloc.o \ - priv/guest-x86/x86helpers.o \ - priv/guest-x86/x86toIR.o + priv/guest-x86/ghelpers.o \ + priv/guest-x86/toIR.o PUB_INCLUDES = -Ipub -PRIV_INCLUDES = -Ipriv/ir -Ipriv/main -Ipriv/host-generic \ - -Ipriv/host-x86 -Ipriv/guest-x86 - -APP_OBJS = test_main.o +# Do not add any priv/host-ARCH or priv/guest-ARCH directories to this +# list, as they contain duplicate file names (each host has a hdefs.h, +# for example). +PRIV_INCLUDES = -Ipriv #CC = gcc341 -#CCFLAGS = -g -Wall -Wshadow +#CCFLAGS = -g -Wall -Wshadow $(EXTRA_CFLAGS) CC = icc CCFLAGS = -g -Wbrief -Wall -wd981 -wd279 -wd1287 -wd869 \ - -wd810 -wd1419 -wd181 -wd111 -wd167 + -wd810 -wd1419 -wd181 -wd111 -wd167 $(EXTRA_CFLAGS) # 981: operands are evaluated in unspecified order # 279: controlling expression is constant # 1287: invalid attribute for parameter @@ -44,16 +44,20 @@ CCFLAGS = -g -Wbrief -Wall -wd981 -wd279 -wd1287 -wd869 \ # 167: argument of type unsigned char incompatible with formal of type char # (the above are for icc 8.0 -- 8.0.0.55 I think) -all: libvex.a $(APP_OBJS) - $(CC) $(CCFLAGS) -o vex $(APP_OBJS) libvex.a +all: libvex.a + rm -f hacked104/valgrind.so + (cd hacked104 && make install) + +vex: libvex.a test_main.o + $(CC) $(CCFLAGS) -o vex test_main.o libvex.a libvex.a: $(LIB_OBJS) rm -f libvex.a ar clq libvex.a $(LIB_OBJS) clean: - rm -f $(APP_OBJS) $(LIB_OBJS) libvex.a vex - + rm -f $(LIB_OBJS) libvex.a vex test_main.o + (cd hacked104 && make clean) @@ -64,9 +68,9 @@ test_main.o: $(PUB_HEADERS) test_main.c $(CC) $(CCFLAGS) $(PUB_INCLUDES) -o test_main.o \ -c test_main.c -priv/ir/ir_defs.o: $(ALL_HEADERS) priv/ir/ir_defs.c - $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/ir/ir_defs.o \ - -c priv/ir/ir_defs.c +priv/ir/irdefs.o: $(ALL_HEADERS) priv/ir/irdefs.c + $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/ir/irdefs.o \ + -c priv/ir/irdefs.c priv/main/vex_main.o: $(ALL_HEADERS) priv/main/vex_main.c $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/main/vex_main.o \ @@ -80,26 +84,26 @@ priv/main/vex_util.o: $(ALL_HEADERS) priv/main/vex_util.c $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/main/vex_util.o \ -c priv/main/vex_util.c -priv/host-x86/x86host_defs.o: $(ALL_HEADERS) priv/host-x86/x86host_defs.c - $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-x86/x86host_defs.o \ - -c priv/host-x86/x86host_defs.c +priv/host-x86/hdefs.o: $(ALL_HEADERS) priv/host-x86/hdefs.c + $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-x86/hdefs.o \ + -c priv/host-x86/hdefs.c -priv/host-x86/isel_x86.o: $(ALL_HEADERS) priv/host-x86/isel_x86.c - $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-x86/isel_x86.o \ - -c priv/host-x86/isel_x86.c +priv/host-x86/isel.o: $(ALL_HEADERS) priv/host-x86/isel.c + $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-x86/isel.o \ + -c priv/host-x86/isel.c -priv/host-generic/host_regs.o: $(ALL_HEADERS) priv/host-generic/host_regs.c - $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-generic/host_regs.o \ - -c priv/host-generic/host_regs.c +priv/host-generic/h_generic_regs.o: $(ALL_HEADERS) priv/host-generic/h_generic_regs.c + $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-generic/h_generic_regs.o \ + -c priv/host-generic/h_generic_regs.c priv/host-generic/reg_alloc.o: $(ALL_HEADERS) priv/host-generic/reg_alloc.c $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host-generic/reg_alloc.o \ -c priv/host-generic/reg_alloc.c -priv/guest-x86/x86toIR.o: $(ALL_HEADERS) priv/guest-x86/x86toIR.c - $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-x86/x86toIR.o \ - -c priv/guest-x86/x86toIR.c +priv/guest-x86/toIR.o: $(ALL_HEADERS) priv/guest-x86/toIR.c + $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-x86/toIR.o \ + -c priv/guest-x86/toIR.c -priv/guest-x86/x86helpers.o: $(ALL_HEADERS) priv/guest-x86/x86helpers.c - $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-x86/x86helpers.o \ - -c priv/guest-x86/x86helpers.c +priv/guest-x86/ghelpers.o: $(ALL_HEADERS) priv/guest-x86/ghelpers.c + $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest-x86/ghelpers.o \ + -c priv/guest-x86/ghelpers.c