Changeset 15818

Timestamp:

2008-05-30T12:00:23+12:00 (16 years ago)

Author:

mdewsnip

Message:

Some tidy ups to Windows makefile in preparation for adding SQLite support.

File:

• gsdl/trunk/win32.mak (modified) (4 diffs)

gsdl/trunk/win32.mak

@@ -35 +35 @@
 MDEFINES = /f win32.mak
 
-OTHERDIRS = packages\windows\gdbm\gdbm packages\windows\crypt\crypt \
-      packages\windows\expat\expat lib src\colservr src\protocol
+INDEXERSDIR = indexers
+
+COMPILEDIRS = packages\windows\gdbm\gdbm packages\windows\crypt\crypt \
+        packages\windows\expat\expat lib src\colservr src\protocol
 
 INSTALLDIRS = src\hashfile src\gdbmedit\db2txt src\gdbmedit\txt2db src\phind\generate \
@@ -43 +45 @@
 
 YAZ_DIR = packages\yaz\yaz-2.1.4\win
-INDEXERSDIR = indexers
 
 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
@@ -64 +65 @@
 !IF $(USE_Z3950)
 MAKECMD = $(MAKECMD) USE_Z3950=1
-OTHERDIRS = $(OTHERDIRS) src\z3950
-YAZ_DIRS = packages\d2m $(YAZ_DIR)
+INSTALLDIRS = $(INSTALLDIRS) src\z3950
+COMPILEDIRS = packages\d2m $(YAZ_DIR) $(COMPILEDIRS)
 !ENDIF
 
 MAKECLEANCMD = $(MAKE) $(MDEFINES) clean
 
-all: win32.mak $(INDEXERSDIR) $(YAZ_DIRS) $(OTHERDIRS) $(INSTALLDIRS) 
+all: win32.mak $(INDEXERSDIR) $(COMPILEDIRS) $(INSTALLDIRS) 
 
 install: win32.mak $(INDEXERSDIR) $(INSTALLDIRS)
@@ -118 +119 @@
     cd "$(GSDLHOME)"
 
-$(OTHERDIRS): FORCE
+$(COMPILEDIRS): FORCE
     cd "$@"
     $(MAKECMD)