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
ignore errors on del.
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
0afc9f9
..
cbd3e75
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,5
+1,5
@@
# makefile.mak - makefile for MS NMAKE
# makefile.mak - makefile for MS NMAKE
-# $Id: makefile,v 1.39 2002-05-31 08:48:06 adam Exp $
+# $Id: makefile,v 1.41 2002-06-04 08:29:53 adam Exp $
#
# Programmed by
# HL: Heikki Levanto, Index Data
#
# Programmed by
# HL: Heikki Levanto, Index Data
@@
-23,7
+23,7
@@
############### Parameters
###########################################################
############### Parameters
###########################################################
-DEBUG=1 # 0 for release, 1 for debug
+DEBUG=0 # 0 for release, 1 for debug
default: all
default: all
@@
-112,8
+112,6
@@
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
COMMON_C_OPTIONS= \
/nologo /W3 /GX /FD /c \
COMMON_C_OPTIONS= \
/nologo /W3 /GX /FD /c \
- /D "YAZ_MODULE_ill=1" \
- /D "YAZ_MODULE_ccl=1" \
/D "_WINDOWS" \
/D "WIN32" \
/FR"$(OBJDIR)\\" \
/D "_WINDOWS" \
/D "WIN32" \
/FR"$(OBJDIR)\\" \
@@
-378,9
+376,9
@@
COMMON_YAZ_OBJS= \
$(YAZ_ZOOM_OBJS)
YAZ_OBJS= \
$(YAZ_ZOOM_OBJS)
YAZ_OBJS= \
- $(COMMON_YAZ_OBJS) \
$(Z3950_OBJS) \
$(Z3950_OBJS) \
- $(ILL_OBJS)
+ $(ILL_OBJS) \
+ $(COMMON_YAZ_OBJS)
DLL_OBJS= $(YAZ_OBJS)
DLL_OBJS= $(YAZ_OBJS)
@@
-787,14
+785,14
@@
$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
############## clean
clean:
############## clean
clean:
- del $(BINDIR)\*.exe
- del $(BINDIR)\*.dll
- del $(TMPDIR)\*.
+ -del $(BINDIR)\*.exe
+ -del $(BINDIR)\*.dll
+ -del $(TMPDIR)\*.
- del $(LIBDIR)\*.MAP
+ -del $(LIBDIR)\*.MAP
- del $(LIBDIR)\*.LIB
- del $(OBJDIR)\*.OBJ
+ -del $(LIBDIR)\*.LIB
+ -del $(OBJDIR)\*.OBJ
realclean: clean
del $(Z3950_C_DIR)\*.c
realclean: clean
del $(Z3950_C_DIR)\*.c
@@
-835,7
+833,13
@@
$(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
###########################################################
#
# $Log: makefile,v $
###########################################################
#
# $Log: makefile,v $
-# Revision 1.39 2002-05-31 08:48:06 adam
+# Revision 1.41 2002-06-04 08:29:53 adam
+# ignore errors on del.
+#
+# Revision 1.40 2002/06/02 21:34:45 adam
+# Remove --enable-module option
+#
+# Revision 1.39 2002/05/31 08:48:06 adam
# Changed SectionIns for NSIS v1.98
#
# Revision 1.38 2002/05/18 09:52:37 oleg
# Changed SectionIns for NSIS v1.98
#
# Revision 1.38 2002/05/18 09:52:37 oleg