X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=win%2Fmakefile;h=5b008885df4412ba07cc14fe7b28dd42472acebc;hb=71f9f9c7183e1e36acd04ea2f8d165cc7ee1adeb;hp=b5ee8aa806e9bfd244d51800461c8e760c2d1759;hpb=bb79c77f6fdcc29e886082a96c50e02405d6a9d3;p=yazpp-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index b5ee8aa..5b00888 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1993-2004, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.4 2004-04-11 17:49:36 adam Exp $
+# $Id: makefile,v 1.6 2005-09-22 12:47:33 adam Exp $
 
 ###########################################################
 ############### Parameters 
@@ -9,7 +9,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # YAZ
-YAZ_DIR=c:\yaz
+YAZ_DIR=..\..\yaz
 
 default: all
 
@@ -58,6 +58,7 @@ zclient: $(ZCLIENT)
 ############### Compiler and linker options 
 ###########################################################
 
+# YAZ includes & libs
 YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib"
 YAZ_DEF=/I"$(YAZ_DIR)\include"
 yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll
@@ -65,10 +66,6 @@ yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll
 $(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll
   copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR)
 
-### C and CPP compiler  (the same thing)
-# Note: $(CPP) has already been defined in the environment
-# (if you set things up right!)
-
 COMMON_C_OPTIONS=          \
   /nologo /W3 /GX /FD /c   \
   $(YAZ_DEF)               \
@@ -148,6 +145,10 @@ TCLOPT= $(COMMON_TCL_OPTIONS)
 ###########################################################
 
 YAZPP_DLL_OBJS = \
+   "$(OBJDIR)\socket-observer.obj" \
+   "$(OBJDIR)\pdu-observer.obj" \
+   "$(OBJDIR)\query.obj" \
+   "$(OBJDIR)\z-server.obj" \
    "$(OBJDIR)\yaz-socket-manager.obj" \
    "$(OBJDIR)\yaz-pdu-assoc.obj" \
    "$(OBJDIR)\yaz-z-assoc.obj" \
@@ -235,7 +236,7 @@ $(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB)
 
 
 ###########################################################
-############### Generated SOurce files
+############### Generated Source files
 ###########################################################
 
 generated: $(ZOOMDIR)\zoom.h