Changeset 15526

Timestamp:

2008-05-16T10:46:54+12:00 (16 years ago)

Author:

mdewsnip

Message:

Various consistency improvements.

File:

• gsdl/trunk/lib/win32.mak (modified) (5 diffs)

gsdl/trunk/lib/win32.mak

@@ -25 +25 @@
 ###########################################################################
 
-GSDLHOME = ..
+GSDL_DIR = ..
+INDEXERS_DIR = $(GSDL_DIR)\indexers
+
+
 GSDL_VC4 = 0
 LOCAL_LIBRARY = 0
 DLL = 0
 DLLDEBUG = 0
-STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
+STLPATH = "$(GSDL_DIR)\packages\windows\stlport\stlport"
 
 
@@ -52 +55 @@
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN \
        -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
-INCLUDES = -I"$(GSDLHOME)" -I"$(GSDLHOME)\indexers\mg\lib" -I"$(GSDLHOME)\packages\windows\gdbm\gdbm"
+INCLUDES = -I"$(GSDL_DIR)" -I"$(INDEXERS_DIR)\mg\lib" -I"$(GSDLHOME)\packages\windows\gdbm\gdbm"
+
 !IF $(GSDL_VC4)
 DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
@@ -107 +111 @@
     text_t.obj
 
+LIBRARY = gsdllib.lib   
 
-all: gsdllib.lib
 
 gsdllib.lib : $(OBJECTS)
@@ -114 +118 @@
     $(AR) -nologo /out:gsdllib.lib $(OBJECTS)
 
-# we want gsdltools to always be compiled in case the status of
-# GSDL_LOCAL_LIBRARY has changed
-gsdltools.obj: FORCE
+all: $(LIBRARY)
+
+install: $(LIBRARY)
 
 clean:
@@ -122 +126 @@
     del gsdllib.lib
 
-install:
+
+# Always recompile gsdltools in case GSDL_LOCAL_LIBRARY has changed
+gsdltools.obj: FORCE
 
 FORCE: