ICU-6.2.4.tar.gz

[apple/icu.git] / icuSources / extra / uconv / makedata.mak

diff --git a/icuSources/extra/uconv/makedata.mak b/icuSources/extra/uconv/makedata.mak
index 159553c6a50b1ef20e8ca3a50ac715e102cc5fcd..2ba70c843e86796e5014c3fc0297e860fa53ea40 100644 (file)
--- a/icuSources/extra/uconv/makedata.mak
+++ b/icuSources/extra/uconv/makedata.mak
@@ -1,5 +1,5 @@
 #**********************************************************************
-#* Copyright (C) 1999-2000, International Business Machines Corporation
+#* Copyright (C) 1999-2004, International Business Machines Corporation
 #* and others.  All Rights Reserved.
 #**********************************************************************
 # nmake file for creating data files on win32
@@ -37,7 +37,7 @@ CFG=Debug
 !ENDIF
 !MESSAGE ICU path is $(ICUP)
 RESNAME=uconvmsg
-RESDIR=.  #$(ICUP)\..\icuapps\uconv\$(RESNAME)
+RESDIR=resources
 RESFILES=resfiles.mk
 ICUDATA=$(ICUP)\data
 
@@ -50,27 +50,13 @@ ICD=$(ICUDATA)^\
 DATA_PATH=$(ICUP)\data^\
 ICUTOOLS=$(ICUP)\bin
 
-# We have to prepare params for pkgdata - to help it find the tools
-!IF "$(CFG)" == "Debug" || "$(CFG)" == "debug"
-PKGOPT=D:$(ICUP)
-!ELSE
-PKGOPT=R:$(ICUP)
-!ENDIF
-
-# This appears in original Microsofts makefiles
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-PATH = $(PATH);$(ICUP)\bin
+PATH = $(ICUP)\bin;$(PATH)
 
 # Suffixes for data files
 .SUFFIXES : .ucm .cnv .dll .dat .res .txt .c
 
 # We're including a list of resource files.
-FILESEPCHAR=\\
+FILESEPCHAR=
 
 !IF EXISTS("$(RESFILES)")
 !INCLUDE "$(RESFILES)"
@@ -78,6 +64,8 @@ FILESEPCHAR=\\
 !ERROR ERROR: cannot find "$(RESFILES)"
 !ENDIF
 RB_FILES = $(RESSRC:.txt=.res)
+RB_FILES = resources\$(RB_FILES:.res =.res resources\)
+RESOURCESDIR=
 
 # This target should build all the data files
 !IF "$(PKGMODE)" == "dll"
@@ -86,41 +74,29 @@ OUTPUT = "$(DLL_OUTPUT)\$(RESNAME).dll"
 OUTPUT = "$(DLL_OUTPUT)\$(RESNAME).lib"
 !ENDIF
 
-ALL : GODATA  $(OUTPUT) GOBACK #$(RESNAME).dat
+ALL : $(OUTPUT)
        @echo All targets are up to date (mode $(PKGMODE))
 
 
 # invoke pkgdata - static
-"$(DLL_OUTPUT)\$(RESNAME).lib" :  $(RB_FILES) $(RESFILES)
+"$(DLL_OUTPUT)\$(RESNAME).lib" : $(RB_FILES) $(RESFILES)
        @echo Building $(RESNAME).lib
-       @"$(ICUTOOLS)\pkgdata" -f -v -m static -c -p $(RESNAME) -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -s "$(RESDIR)" <<pkgdatain.txt
-$(RB_FILES:.res =.res
+       @"$(ICUTOOLS)\pkgdata" -f -v -m static -c -p $(RESNAME) -d "$(DLL_OUTPUT)" -s "$(RESDIR)" <<pkgdatain.txt
+$(RESSRC:.txt =.res
 )
 <<KEEP
 
-# utility to send us to the right dir
-GODATA :
-#      cd "$(RESDIR)"
-
-# utility to get us back to the right dir
-GOBACK :
-#      cd "$(RESDIR)\.."
-
 # This is to remove all the data files
 CLEAN :
-       @cd "$(RESDIR)"
-       -@erase "*.res"
-       -@erase "uconvmsg*.*"
-       -@erase "*.obj"
-       -@erase "base*.*"
-       @cd "$(ICUTOOLS)"
     -@erase "$(RB_FILES)"
-    -@"$(ICUTOOLS)\pkgdata" -f --clean -v -m static -c -p $(RESNAME) -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -s "$(RESDIR)" pkgdatain.txt
+       -@erase "$(CFG)\*uconvmsg*.*"
+    -@"$(ICUTOOLS)\pkgdata" -f --clean -v -m static -c -p $(RESNAME) -d "$(DLL_OUTPUT)" -s "$(RESDIR)" pkgdatain.txt
 
 # Inference rule for creating resource bundles
-.txt.res:
+{$(RESDIR)}.txt{$(RESDIR)}.res:
        @echo Making Resource Bundle files
-        "$(ICUTOOLS)\genrb" -t -p $(RESNAME) -s $(@D) -d $(@D) $(?F)
+       "$(ICUTOOLS)\genrb" -s $(@D) -d $(@D) $(?F)
 
 
 $(RESSRC) : {"$(ICUTOOLS)"}genrb.exe
+