Move definitions to beginning of file.

diff --git a/win32/Makefile.mak b/win32/Makefile.mak
index 5342f8f5889202c02f0fdc73cd0bb1e03a39d2a9..dbec27b1c5bfd8fa284e404dc8037dc3091938a0 100755 (executable)
--- a/win32/Makefile.mak
+++ b/win32/Makefile.mak
@@ -71,56 +71,56 @@ LIBFLAGS = $(LIBFLAGS1)
 \r
 CPPFLAGS = $(CXXFLAGS)\r
 \r
+KUMU_OBJS = KM_fileio.obj KM_log.obj KM_prng.obj KM_util.obj KM_xml.obj\r
+ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \\r
+       JP2K_Sequence_Parser.obj JP2K.obj PCM_Parser.obj Wav.obj \\r
+       TimedText_Parser.obj KLV.obj Dict.obj MXFTypes.obj MXF.obj \\r
+       Index.obj Metadata.obj AS_DCP.obj AS_DCP_MXF.obj AS_DCP_AES.obj \\r
+       h__Reader.obj h__Writer.obj AS_DCP_MPEG2.obj AS_DCP_JP2K.obj \\r
+       AS_DCP_PCM.obj AS_DCP_TimedText.obj PCMParserList.obj \\r
+       MDD.obj\r
+\r
 {$(SRCDIR)\}.cpp{}.obj:\r
        $(CXX) $(CXXFLAGS) -Fd$(OBJDIR)\ /c $<\r
 \r
 all: kmfilegen.exe kmrandgen.exe kmuuidgen.exe asdcp-test.exe blackwave.exe klvwalk.exe wavesplit.exe\r
 \r
 clean:\r
-       erase *.exe *.lib *.obj *.ilk *.pdb *.idb\r
+       erase $(SRCDIR)\*.exe $(SRCDIR)\*.lib $(SRCDIR)\*.obj $(SRCDIR)\*.ilk $(SRCDIR)\*.pdb $(SRCDIR)\*.idb\r
 \r
 libkumu.lib : $(KUMU_OBJS)\r
 !IFDEF WITH_XERCES\r
 !IFDEF DEBUG\r
-       $(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $? libeay32.lib xerces-c_2D.lib\r
+       $(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib xerces-c_2D.lib\r
 !ELSE\r
-       $(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $? libeay32.lib xerces-c_2.lib\r
+       $(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib xerces-c_2.lib\r
 !ENDIF\r
 !ELSEIFDEF WITH_XML_PARSER\r
-       $(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $? libeay32.lib libexpatMT.lib\r
+       $(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib libexpatMT.lib\r
 !ELSE\r
-       $(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $? libeay32.lib\r
+       $(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib\r
 !ENDIF \r
 \r
 libasdcp.lib: libkumu.lib $(ASDCP_OBJS)\r
-       $(LIB_EXE) $(LIBFLAGS) /OUT:libasdcp.lib $?\r
+       $(LIB_EXE) $(LIBFLAGS) /OUT:libasdcp.lib $**\r
 \r
 blackwave.exe: libasdcp.lib blackwave.obj\r
-       $(LINK) $(LINKFLAGS) /OUT:blackwave.exe $? Advapi32.lib\r
+       $(LINK) $(LINKFLAGS) /OUT:blackwave.exe $** Advapi32.lib\r
 \r
 wavesplit.exe: libasdcp.lib wavesplit.obj\r
-       $(LINK) $(LINKFLAGS) /OUT:wavesplit.exe $? Advapi32.lib\r
+       $(LINK) $(LINKFLAGS) /OUT:wavesplit.exe $** Advapi32.lib\r
 \r
 kmuuidgen.exe: libkumu.lib kmuuidgen.obj\r
-       $(LINK) $(LINKFLAGS) /OUT:kmuuidgen.exe $? Advapi32.lib\r
+       $(LINK) $(LINKFLAGS) /OUT:kmuuidgen.exe $** Advapi32.lib\r
 \r
 kmrandgen.exe: libkumu.lib kmrandgen.obj\r
-       $(LINK) $(LINKFLAGS) /OUT:kmrandgen.exe $? Advapi32.lib\r
+       $(LINK) $(LINKFLAGS) /OUT:kmrandgen.exe $** Advapi32.lib\r
 \r
 kmfilegen.exe: libkumu.lib kmfilegen.obj\r
-       $(LINK) $(LINKFLAGS) /OUT:kmfilegen.exe $? Advapi32.lib\r
+       $(LINK) $(LINKFLAGS) /OUT:kmfilegen.exe $** Advapi32.lib\r
 \r
 klvwalk.exe: libasdcp.lib klvwalk.obj\r
-       $(LINK) $(LINKFLAGS) /OUT:klvwalk.exe $? Advapi32.lib\r
+       $(LINK) $(LINKFLAGS) /OUT:klvwalk.exe $** Advapi32.lib\r
 \r
 asdcp-test.exe: libasdcp.lib asdcp-test.obj\r
-       $(LINK) $(LINKFLAGS) /OUT:asdcp-test.exe $? Advapi32.lib\r
-\r
-KUMU_OBJS = KM_fileio.obj KM_log.obj KM_prng.obj KM_util.obj KM_xml.obj\r
-ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \\r
-       JP2K_Sequence_Parser.obj JP2K.obj PCM_Parser.obj Wav.obj \\r
-       TimedText_Parser.obj KLV.obj Dict.obj MXFTypes.obj MXF.obj \\r
-       Index.obj Metadata.obj AS_DCP.obj AS_DCP_MXF.obj AS_DCP_AES.obj \\r
-       h__Reader.obj h__Writer.obj AS_DCP_MPEG2.obj AS_DCP_JP2K.obj \\r
-       AS_DCP_PCM.obj AS_DCP_TimedText.obj PCMParserList.obj \\r
-       MDD.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:asdcp-test.exe $** Advapi32.lib\r