From cf4e57281b867878521d6f38ec5b0f552c4d2c90 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 28 Sep 2010 10:50:05 +0200 Subject: [PATCH] midltests: move the current implementation to midltests_simple.exe metze --- testprogs/win32/midltests/Makefile | 39 +++++++--------------- .../win32/midltests/{Makefile => Makefile.simple} | 12 +++---- .../midltests/{midltests.c => midltests_simple.c} | 0 3 files changed, 18 insertions(+), 33 deletions(-) rewrite testprogs/win32/midltests/Makefile (98%) copy testprogs/win32/midltests/{Makefile => Makefile.simple} (65%) rename testprogs/win32/midltests/{midltests.c => midltests_simple.c} (100%) diff --git a/testprogs/win32/midltests/Makefile b/testprogs/win32/midltests/Makefile dissimilarity index 98% index 535968b16d9..6eeadeb7b7e 100644 --- a/testprogs/win32/midltests/Makefile +++ b/testprogs/win32/midltests/Makefile @@ -1,27 +1,12 @@ -INCLUDES=-I -CFLAGS=$(INCLUDES) -Zi -D_WIN32_WINNT=0x502 -LIBS=rpcrt4.lib - -all: midltests.exe - -clean: - del *~ *.obj *.exe midltests.h midltests_s.c midltests_c.c - -#MIDL_ARGS=/target NT50 -MIDL_ARGS=/Os /prefix client cli_ /prefix server srv_ /prefix switch swi_ -midltests.h midltests_s.c midltests_c.c: midltests.idl midltests.acf - midl $(MIDL_ARGS) /acf midltests.acf midltests.idl - -MIDLTESTS_OBJ = midltests.obj midltests_s_m.obj midltests_c_m.obj midltests_marshall.obj utils.obj -midltests.exe: $(MIDLTESTS_OBJ) - $(CC) -o midltests.exe $(MIDLTESTS_OBJ) $(LIBS) - -midltests.obj: midltests.h midltests.idl -midltests_c_m.c: midltests_c.c -midltests_s_m.c: midltests_s.c - -midltests.obj: midltests.h midltests.idl midltests.c -midltests_s_m.obj: midltests_marshall.h midltests_s.c midltests_s_m.c -midltests_c_m.obj: midltests_marshall.h midltests_c.c midltests_c_m.c -midltests_marshall.obj: midltests.h midltests_marshall.c -utils.obj: midltests.h utils.c + +all: + @echo "nmake targets:" + @echo " clean" + @echo " simple" + +clean: + @call nmake /f Makefile.simple /NOLOGO clean + +simple: + @call nmake /f Makefile.simple /NOLOGO all + diff --git a/testprogs/win32/midltests/Makefile b/testprogs/win32/midltests/Makefile.simple similarity index 65% copy from testprogs/win32/midltests/Makefile copy to testprogs/win32/midltests/Makefile.simple index 535968b16d9..ec4a54294c8 100644 --- a/testprogs/win32/midltests/Makefile +++ b/testprogs/win32/midltests/Makefile.simple @@ -2,7 +2,7 @@ INCLUDES=-I CFLAGS=$(INCLUDES) -Zi -D_WIN32_WINNT=0x502 LIBS=rpcrt4.lib -all: midltests.exe +all: midltests_simple.exe clean: del *~ *.obj *.exe midltests.h midltests_s.c midltests_c.c @@ -12,15 +12,15 @@ MIDL_ARGS=/Os /prefix client cli_ /prefix server srv_ /prefix switch swi_ midltests.h midltests_s.c midltests_c.c: midltests.idl midltests.acf midl $(MIDL_ARGS) /acf midltests.acf midltests.idl -MIDLTESTS_OBJ = midltests.obj midltests_s_m.obj midltests_c_m.obj midltests_marshall.obj utils.obj -midltests.exe: $(MIDLTESTS_OBJ) - $(CC) -o midltests.exe $(MIDLTESTS_OBJ) $(LIBS) +MIDLTESTS_OBJ = midltests_simple.obj midltests_s_m.obj midltests_c_m.obj midltests_marshall.obj utils.obj +midltests_simple.exe: $(MIDLTESTS_OBJ) + $(CC) -o midltests_simple.exe $(MIDLTESTS_OBJ) $(LIBS) -midltests.obj: midltests.h midltests.idl +midltests_simple.obj: midltests.h midltests.idl midltests_c_m.c: midltests_c.c midltests_s_m.c: midltests_s.c -midltests.obj: midltests.h midltests.idl midltests.c +midltests_simple.obj: midltests.h midltests.idl midltests_simple.c midltests_s_m.obj: midltests_marshall.h midltests_s.c midltests_s_m.c midltests_c_m.obj: midltests_marshall.h midltests_c.c midltests_c_m.c midltests_marshall.obj: midltests.h midltests_marshall.c diff --git a/testprogs/win32/midltests/midltests.c b/testprogs/win32/midltests/midltests_simple.c similarity index 100% rename from testprogs/win32/midltests/midltests.c rename to testprogs/win32/midltests/midltests_simple.c -- 2.11.4.GIT