midltests: move the current implementation to midltests_simple.exe

metze

diff --git a/testprogs/win32/midltests/Makefile b/testprogs/win32/midltests/Makefile
index 535968b16d9308140c9021b629ce859cf5b284cd..6eeadeb7b7ec5c5182e4b75be76b947409f2e42c 100644 (file)
--- 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
+all:
+       @echo "nmake targets:"
+       @echo "   clean"
+       @echo "   simple"
 
 clean:
-       del *~ *.obj *.exe midltests.h midltests_s.c midltests_c.c
+       @call nmake /f Makefile.simple /NOLOGO clean
 
-#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
+simple:
+       @call nmake /f Makefile.simple /NOLOGO all
 
-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

diff --git a/testprogs/win32/midltests/Makefile.simple b/testprogs/win32/midltests/Makefile.simple
new file mode 100644 (file)
index 0000000..ec4a542
--- /dev/null
+++ b/testprogs/win32/midltests/Makefile.simple
@@ -0,0 +1,27 @@
+INCLUDES=-I
+CFLAGS=$(INCLUDES) -Zi -D_WIN32_WINNT=0x502
+LIBS=rpcrt4.lib
+
+all: midltests_simple.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_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_simple.obj: midltests.h midltests.idl
+midltests_c_m.c: midltests_c.c
+midltests_s_m.c: midltests_s.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
+utils.obj: midltests.h utils.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