X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=97136b01315eeb6a55051eaee6af9832d2f99b89;hb=2dbe1df5facb92bac31b5da0ca2e2e8ee6f9b358;hp=58f0a03af821d7e746ff4a7f678924078b948693;hpb=10541f418a12339fbb75de5f69ec0327d180f8f1;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 58f0a03..97136b0 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
-# Copyright (C) 1995-2007, Index Data ApS
+# Copyright (C) 1995-2008, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.140 2008-01-09 15:00:47 adam Exp $
+# $Id: makefile,v 1.145 2008-02-21 10:15:31 adam Exp $
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -21,7 +21,7 @@ ICONV_DIR = c:\iconv-1.9.2.win32
 
 # icu charcter conversion utility
 # get icu libraries from http://www.icu-project.org
-HAVE_ICU=0
+HAVE_ICU=1
 ICU_DIR = c:\icu
 
 # libxslt
@@ -44,7 +44,7 @@ BISON=bison
 
 default: all
 
-all: dirs generate dll client ztest zoomsh utilprog testprog iconv icu libxml2 libxslt
+all: dirs generate dll client ztest yazicu zoomsh utilprog testprog iconv icu libxml2 libxslt
 
 NSIS="c:\program files\nsis\makensis.exe"
 HHC="c:\program files\html help workshop\hhc.exe"
@@ -94,14 +94,19 @@ TMP=$(TMPDIR)
 # Targets - what to make
 
 !if $(DEBUG)
-DLL=$(BINDIR)\yaz3d.dll
+YAZ_DLL=$(BINDIR)\yaz3d.dll
 YAZ_IMPLIB=$(LIBDIR)\yaz3d.lib
+YAZ_ICU_DLL=$(BINDIR)\yaz_icu3d.dll
+YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu3d.lib
 !else
-DLL=$(BINDIR)\yaz3.dll
+YAZ_DLL=$(BINDIR)\yaz3.dll
 YAZ_IMPLIB=$(LIBDIR)\yaz3.lib
+YAZ_ICU_DLL=$(BINDIR)\yaz_icu3.dll
+YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu3.lib
 !endif
 
 CLIENT=$(BINDIR)\yaz-client.exe
+YAZ_ICU=$(BINDIR)\yaz-icu.exe
 ZOOMSH=$(BINDIR)\zoomsh.exe
 ZTEST=$(BINDIR)\yaz-ztest.exe
 
@@ -124,7 +129,7 @@ TSTLOG=$(BINDIR)\tstlog.exe
 TST_TIMING=$(BINDIR)\tst_timing.exe
 
 # shortcut names defined here
-dll: dirs generate $(DLL) 
+dll: dirs generate $(YAZ_DLL) 
 client: dirs generate $(CLIENT)
 ztest: dirs generate $(ZTEST)
 
@@ -168,6 +173,7 @@ ICU_DEF= \
 ICU_LIB= \
   $(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib
 icu: $(BINDIR)\icudt38.dll $(BINDIR)\icuin38.dll $(BINDIR)\icuuc38.dll
+yazicu: dirs generate $(YAZ_ICU) 
 
 $(BINDIR)\icudt38.dll:
   copy "$(ICU_DIR)\bin\icudt38.dll" $(BINDIR)
@@ -180,6 +186,7 @@ ICU_DEF= \
   /D YAZ_HAVE_ICU=0
 ICU_LIB=
 icu:
+yazicu:
 !endif
 
 ### 
@@ -275,7 +282,7 @@ MT=echo
 !endif
 
 LINK_LIBS= kernel32.lib wsock32.lib advapi32.lib \
-	   $(ICONV_LIB) $(ICU_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
+	   $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
 
 COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
 
@@ -318,6 +325,8 @@ YAZ_CLIENT_OBJS= \
    $(OBJDIR)\admin.obj \
    $(OBJDIR)\fhistory.obj
 
+YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj 
+
 ZTEST_OBJS= \
     $(OBJDIR)\read-marc.obj \
     $(OBJDIR)\read-grs.obj \
@@ -470,7 +479,7 @@ MISC_OBJS= \
    $(OBJDIR)\http.obj \
    $(OBJDIR)\match_glob.obj \
    $(OBJDIR)\poll.obj \
-    $(OBJDIR)\icu_I18N.obj
+   $(OBJDIR)\daemon.obj 
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -513,6 +522,9 @@ DLL_OBJS =\
    $(MISC_OBJS) \
    $(Z3950_OBJS) \
    $(ILL_OBJS) \
+   
+ICU_DLL_OBJS =\
+   $(OBJDIR)\icu_I18N.obj
 
 # Generated C and H files
 
@@ -754,12 +766,10 @@ $(SRCDIR)\cql.c: $(SRCDIR)\cql.y
 # Resources
 # The RC compiler (resource files)
 RSC=rc.exe
-COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)" 
-DEBUG_RC_OPTIONS=/d "_DEBUG"
-RELEASE_RC_OPTIONS=/d "NDEBUG"
 
-YAZ_RES=$(OBJDIR)\yaz.res
 YAZ_RC=$(WINDIR)\yaz.rc
+YAZ_RES=$(OBJDIR)\yaz.res
+YAZ_ICU_RES=$(OBJDIR)\yaz_icu.res
 
 !if $(DEBUG)
 RSOPT=/d_DEBUG
@@ -770,9 +780,12 @@ RSOPT=/d_NDEBUG
 $(YAZ_RES): $(YAZ_RC)
 	$(RSC) $(RSOPT) /I"../include" /fo"$(YAZ_RES)" $(YAZ_RC) 
 
+$(YAZ_ICU_RES): $(YAZ_RC)
+	$(RSC) $(RSOPT) /DICU=1 /I"../include" /fo"$(YAZ_ICU_RES)" $(YAZ_RC) 
+
 # Linking
 
-$(DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
+$(YAZ_DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
 	$(LINK_DLL) \
 		$(DLL_OBJS) \
 		$(YAZ_RES) \
@@ -780,76 +793,89 @@ $(DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
 		/implib:"$(YAZ_IMPLIB)" 
 	$(MT) -manifest $@.manifest -outputresource:$@;2
 
-$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(DLL)
+$(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
+	$(LINK_DLL) $(ICU_LIB) $(YAZ_IMPLIB)\
+		$(ICU_DLL_OBJS) \
+		$(YAZ_ICU_RES) \
+		/out:$@ \
+		/implib:"$(YAZ_ICU_IMPLIB)" 
+	$(MT) -manifest $@.manifest -outputresource:$@;2
+
+$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_CLIENT_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS) $(DLL)
+$(YAZ_ICU) : "$(BINDIR)" $(YAZ_ICU_OBJS) $(YAZ_ICU_DLL)
+	$(LINK_PROGRAM) $(ICU_LIB) $(YAZ_ICU_IMPLIB) $(YAZ_ICU_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
+
+
+$(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMSH_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(ZOOMTST1) : "$(BINDIR)" $(YAZ_ZOOMTST1_OBJS) $(DLL)
+$(ZOOMTST1) : "$(BINDIR)" $(YAZ_ZOOMTST1_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST1_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(ZOOMTST2) : "$(BINDIR)" $(YAZ_ZOOMTST2_OBJS) $(DLL)
+$(ZOOMTST2) : "$(BINDIR)" $(YAZ_ZOOMTST2_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST2_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(ZOOMTST3) : "$(BINDIR)" $(YAZ_ZOOMTST3_OBJS) $(DLL)
+$(ZOOMTST3) : "$(BINDIR)" $(YAZ_ZOOMTST3_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST3_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(ZOOMTST4) : "$(BINDIR)" $(YAZ_ZOOMTST4_OBJS) $(DLL)
+$(ZOOMTST4) : "$(BINDIR)" $(YAZ_ZOOMTST4_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST4_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS) $(DLL)
+$(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST5_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS) $(DLL)
+$(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST6_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS) $(DLL)
+$(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST7_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS) $(DLL)
+$(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST8_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(ZOOMTST9) : "$(BINDIR)" $(YAZ_ZOOMTST9_OBJS) $(DLL)
+$(ZOOMTST9) : "$(BINDIR)" $(YAZ_ZOOMTST9_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST9_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(ZOOMTST10) : "$(BINDIR)" $(YAZ_ZOOMTST10_OBJS) $(DLL)
+$(ZOOMTST10) : "$(BINDIR)" $(YAZ_ZOOMTST10_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST10_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS) $(DLL)
+$(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_CQL2PQF_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(CQL2XCQL) : "$(BINDIR)" $(YAZ_CQL2XCQL_OBJS) $(DLL)
+$(CQL2XCQL) : "$(BINDIR)" $(YAZ_CQL2XCQL_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_CQL2XCQL_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
+$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM)	$(ZTEST_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(YAZ_MARCDUMP) : "$(BINDIR)" $(YAZ_MARCDUMP_OBJS) $(DLL)
+$(YAZ_MARCDUMP) : "$(BINDIR)" $(YAZ_MARCDUMP_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_MARCDUMP_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 
-$(TSTLOG) : "$(BINDIR)" $(TSTLOG_OBJS) $(DLL)
+$(TSTLOG) : "$(BINDIR)" $(TSTLOG_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(TSTLOG_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
-$(TST_TIMING) : "$(BINDIR)" $(TST_TIMING_OBJS) $(DLL)
+$(TST_TIMING) : "$(BINDIR)" $(TST_TIMING_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(TST_TIMING_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1