summaryrefslogtreecommitdiff
path: root/testprogs/win32
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-09-28 10:50:05 +0200
committerStefan Metzmacher <metze@samba.org>2010-09-29 01:42:27 +0200
commitcf4e57281b867878521d6f38ec5b0f552c4d2c90 (patch)
tree0ee61e4a34e1d76904745c14e9a7a5251582cc45 /testprogs/win32
parentd8a0436fb4d61e16a04a8249ece79d563ae2e3cd (diff)
downloadsamba-cf4e57281b867878521d6f38ec5b0f552c4d2c90.tar.gz
samba-cf4e57281b867878521d6f38ec5b0f552c4d2c90.tar.bz2
samba-cf4e57281b867878521d6f38ec5b0f552c4d2c90.zip
midltests: move the current implementation to midltests_simple.exe
metze
Diffstat (limited to 'testprogs/win32')
-rw-r--r--testprogs/win32/midltests/Makefile29
-rw-r--r--testprogs/win32/midltests/Makefile.simple27
-rw-r--r--testprogs/win32/midltests/midltests_simple.c (renamed from testprogs/win32/midltests/midltests.c)0
3 files changed, 34 insertions, 22 deletions
diff --git a/testprogs/win32/midltests/Makefile b/testprogs/win32/midltests/Makefile
index 535968b16d..6eeadeb7b7 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
+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
index 0000000000..ec4a54294c
--- /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
index 61d4ce0812..61d4ce0812 100644
--- a/testprogs/win32/midltests/midltests.c
+++ b/testprogs/win32/midltests/midltests_simple.c