Changeset 209 for trunk/src/helpers/makefile

Timestamp:

Aug 19, 2002, 11:23:17 PM (23 years ago)

Author:

umoeller

Message:

Dialog formatter rewrite.

File:

• trunk/src/helpers/makefile (modified) (4 diffs)

trunk/src/helpers/makefile

@@ -142 +142 @@
     @echo ----- Leaving $(MAKEDIR)
 
+# Define the main dependency between the output HELPERS.LIB and
+# all the object files.
+# $? represents the names of all dependent files that are
+# out-of-date with respect to the target file.
+# The exclamation point ( ! ) preceding the LIB command causes NMAKE
+# to execute the LIB command once for each dependent file in the list.
+
+$(OUTPUTDIR)\helpers.lib: $(OBJS)
+!ifdef EMX
+    !emxomfar cr $* $?
+!else
+    !ilib /nol /nob $* -+$?;
+!endif
+
+# same thing for cp.lib
+$(OUTPUTDIR)\cp.lib: $(CPOBJS)
+!ifdef EMX
+    !emxomfar cr $* $?
+!else
+    !ilib /nol /nob $* -+$?;
+!endif
+
+# same thing for plainc.lib
+$(OUTPUTDIR)\plainc.lib: $(PLAINCOBJS)
+!ifdef EMX
+    !emxomfar cr $* $?
+!else
+    !ilib /nol /nob $* -+$?;
+!endif
+
+!include helpers_post.in
+
+###################################################
+#
 # "test" target: for test cases
+#
+###################################################
+
 TESTCASE_DIR = testcase
 
-TESTCASE_CC = icc /c /ti+ /w2 /ss /se /i$(HELPERS_BASE)\include /Fo$(TESTCASE_DIR)\$(@B).obj $(@B).c
+DEBUGDIALOG =
+!ifdef DBGDLG
+DEBUGDIALOG = /DDEBUG_DIALOG_WINDOWS=1
+!endif
+
+TESTCASE_CC = icc /c /ti+ /w2 /ss /se /D__DEBUG__=1 $(DEBUGDIALOG) /i$(HELPERS_BASE)\include /Fo$(TESTCASE_DIR)\$(@B).obj $(@B).c
 
 .c.{$(TESTCASE_DIR)}.obj:
     @echo $(MAKEDIR)\makefile: Compiling $(@B).c
+    @echo INCLUDE is $(INCLUDE)
     $(TESTCASE_CC)
 
@@ -155 +198 @@
     dosh.exe \
     dialog.exe \
-    vcard.exe \
+    exeh.exe \
     fdlg.exe \
-
-# dosh.exe
-DOSH_TEST_OBJS = \
-    $(TESTCASE_DIR)\dosh.obj \
-    $(TESTCASE_DIR)\_test_dosh.obj
-
-dosh.exe: $(DOSH_TEST_OBJS)
-    ilink /debug /optfunc /pmtype:vio $(DOSH_TEST_OBJS) /o:$@
-
-$(TESTCASE_DIR)\dialog.obj: ..\..\include\helpers\dialog.h
-$(TESTCASE_DIR)\_test_dialog.obj: ..\..\include\helpers\dialog.h
+    vcard.exe
 
 # dialog.exe
@@ -190 +223 @@
     $(TESTCASE_DIR)\gpih.obj
 
+$(TESTCASE_DIR)\dialog.obj: ..\..\include\helpers\dialog.h
+$(TESTCASE_DIR)\_test_dialog.obj: ..\..\include\helpers\dialog.h
+
 dialog.exe: $(DIALOG_TEST_OBJS)
-    ilink /debug /optfunc /pmtype:pm $(DIALOG_TEST_OBJS) /o:$@
+    ilink /debug /optfunc /pmtype:pm $(DIALOG_TEST_OBJS) pmprintf.lib /o:$@
+
+# dosh.exe
+DOSH_TEST_OBJS = \
+    $(TESTCASE_DIR)\dosh.obj \
+    $(TESTCASE_DIR)\_test_dosh.obj
+
+dosh.exe: $(DOSH_TEST_OBJS)
+    ilink /debug /optfunc /pmtype:vio $(DOSH_TEST_OBJS) pmprintf.lib /o:$@
+
+# exeh.exe
+EXEH_TEST_OBJS = \
+    $(TESTCASE_DIR)\dosh.obj \
+    $(TESTCASE_DIR)\exeh.obj \
+    $(TESTCASE_DIR)\stringh.obj \
+    $(TESTCASE_DIR)\xstring.obj \
+    $(TESTCASE_DIR)\_test_exeh.obj
+
+exeh.exe: $(EXEH_TEST_OBJS)
+    ilink /debug /optfunc /pmtype:vio $(EXEH_TEST_OBJS) pmprintf.lib /o:$@
+
+# fdlg.exe
+FDLG_TEST_OBJS = \
+    $(TESTCASE_DIR)\_call_filedlg.obj
+
+fdlg.exe: $(FDLG_TEST_OBJS)
+    ilink /debug /pmtype:pm $(FDLG_TEST_OBJS) /o:$@
 
 # vcard.exe
@@ -210 +272 @@
     ilink /debug /pmtype:vio $(VCARD_TEST_OBJS) /o:$@
 
-# vcard.exe
-VCARD_TEST_OBJS = \
-    $(TESTCASE_DIR)\_call_filedlg.obj
-
-fdlg.exe: $(VCARD_TEST_OBJS)
-    ilink /debug /pmtype:pm $(VCARD_TEST_OBJS) /o:$@
-
 test: $(TESTCASE_TARGETS)
 
-# Define the main dependency between the output HELPERS.LIB and
-# all the object files.
-# $? represents the names of all dependent files that are
-# out-of-date with respect to the target file.
-# The exclamation point ( ! ) preceding the LIB command causes NMAKE
-# to execute the LIB command once for each dependent file in the list.
-
-$(OUTPUTDIR)\helpers.lib: $(OBJS)
-!ifdef EMX
-    !emxomfar cr $* $?
-!else
-    !ilib /nol /nob $* -+$?;
-!endif
-
-# same thing for cp.lib
-$(OUTPUTDIR)\cp.lib: $(CPOBJS)
-!ifdef EMX
-    !emxomfar cr $* $?
-!else
-    !ilib /nol /nob $* -+$?;
-!endif
-
-# same thing for plainc.lib
-$(OUTPUTDIR)\plainc.lib: $(PLAINCOBJS)
-!ifdef EMX
-    !emxomfar cr $* $?
-!else
-    !ilib /nol /nob $* -+$?;
-!endif
-
-!include helpers_post.in
-
-
+