projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re-enabled the -v notime option, it was broken.
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
33adabd
..
263e59b
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,10
+1,9
@@
# Copyright (C) 1994-2004, Index Data
# All rights reserved.
# Copyright (C) 1994-2004, Index Data
# All rights reserved.
-# $Id: makefile,v 1.82 2004-08-18 09:43:10 adam Exp $
+# $Id: makefile,v 1.87 2004-11-21 21:56:28 adam Exp $
#
# Programmed by
# HL: Heikki Levanto, Index Data
#
# Programmed by
# HL: Heikki Levanto, Index Data
-#
###########################################################
############### Parameters
###########################################################
############### Parameters
@@
-41,13
+40,15
@@
all: dirs generate dll client ztest zoomsh utilprog iconv libxml2
NSIS="c:\program files\nsis\makensis.exe"
NSIS="c:\program files\nsis\makensis.exe"
-nsis:
+dist:
nmake DEBUG=1 clean
nmake DEBUG=0 clean
nmake DEBUG=1 clean
nmake DEBUG=0 clean
- nmake DEBUG=1 dll
nmake DEBUG=0
$(NSIS) yaz.nsi
nmake DEBUG=0
$(NSIS) yaz.nsi
+nsis:
+ $(NSIS) yaz.nsi
+
nsishelp:
$(NSIS)
nsishelp:
$(NSIS)
@@
-86,8
+87,8
@@
TMP=$(TMPDIR)
###########################################################
!if $(DEBUG)
###########################################################
!if $(DEBUG)
-DLL=$(BINDIR)\yazdebug.dll
-IMPLIB=$(LIBDIR)\yazdebug.lib
+DLL=$(BINDIR)\yazd.dll
+IMPLIB=$(LIBDIR)\yazd.lib
!else
DLL=$(BINDIR)\yaz.dll
IMPLIB=$(LIBDIR)\yaz.lib
!else
DLL=$(BINDIR)\yaz.dll
IMPLIB=$(LIBDIR)\yaz.lib
@@
-111,9
+112,9
@@
CQL2XCQL=$(BINDIR)\cql2xcql.exe
YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
# shortcut names defined here
YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
# shortcut names defined here
-dll : $(DLL)
-client: $(CLIENT)
-ztest: $(ZTEST)
+dll: dirs generate $(DLL)
+client: dirs generate $(CLIENT)
+ztest: dirs generate $(ZTEST)
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
$(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
$(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
@@
-171,7
+172,6
@@
COMMON_C_OPTIONS= \
$(LIBXML2_DEF) \
/D "_WINDOWS" \
/D "WIN32" \
$(LIBXML2_DEF) \
/D "_WINDOWS" \
/D "WIN32" \
- /D "HAVE_WCHAR_H=1" \
/FR"$(OBJDIR)\\" \
/Fo"$(OBJDIR)\\" \
/Fd"$(OBJDIR)\\"
/FR"$(OBJDIR)\\" \
/Fo"$(OBJDIR)\\" \
/Fd"$(OBJDIR)\\"
@@
-359,6
+359,7
@@
YAZ_UTIL_OBJS= \
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\diagbib1.obj \
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\diagbib1.obj \
+ $(OBJDIR)\diagsrw.obj \
$(OBJDIR)\zget.obj \
$(OBJDIR)\logrpn.obj \
$(OBJDIR)\pquery.obj \
$(OBJDIR)\zget.obj \
$(OBJDIR)\logrpn.obj \
$(OBJDIR)\pquery.obj \