Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

[pazpar2-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index d9b0419..4146b16 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -4,7 +4,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 USE_MANIFEST = 0 # Can be enabled Visual Studio 2005/2008
 PACKAGE_NAME=pazpar2
-PACKAGE_VERSION=1.1.0
+PACKAGE_VERSION=1.2.3
 
 # YAZ
 YAZ_DIR=..\..\yaz
@@ -25,7 +25,7 @@ all: dirs yaz libxslt pazpar2
 
 NSIS="c:\program files\nsis\makensis.exe"
 
-dist:
+dist: pazpar2.nsi
        nmake DEBUG=1 clean
        nmake DEBUG=0 clean
        nmake DEBUG=0
@@ -44,6 +44,12 @@ BINDIR=$(ROOTDIR)\bin       # We produce exes and dlls there
 WINDIR=$(ROOTDIR)\win       # all these Win make things
 SRCDIR=$(ROOTDIR)\src       # for the case we move them under src
 
+!if $(DEBUG)
+OBJDIR=$(WINDIR)\dobj
+!else
+OBJDIR=$(WINDIR)\obj
+!endif
+
 TMPDIR=$(ROOTDIR)\win\tmp
 TMP=$(TMPDIR)
 
@@ -183,7 +189,6 @@ PAZPAR2_OBJS = \
    "$(OBJDIR)\relevance.obj" \
    "$(OBJDIR)\termlists.obj" \
    "$(OBJDIR)\normalize7bit.obj" \
-   "$(OBJDIR)\util.obj" \
    "$(OBJDIR)\zeerex.obj" \
    "$(OBJDIR)\database.obj" \
    "$(OBJDIR)\settings.obj" \
@@ -191,6 +196,11 @@ PAZPAR2_OBJS = \
    "$(OBJDIR)\charsets.obj" \
    "$(OBJDIR)\client.obj" \
    "$(OBJDIR)\dirent.obj" \
+   "$(OBJDIR)\jenkins_hash.obj" \
+   "$(OBJDIR)\marcmap.obj" \
+   "$(OBJDIR)\marchash.obj" \
+   "$(OBJDIR)\normalize_record.obj" \
+   "$(OBJDIR)\normalize_cache.obj" \
    "$(OBJDIR)\connection.obj"