Changeset 13777 for trunk/gsdl/win32.mak

Timestamp:

2007-01-24T10:48:33+13:00 (17 years ago)

Author:

kjdon

Message:

merged the indexers branch. mg, mgpp, lucene and unac now live in indexers repository

File:

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

trunk/gsdl/win32.mak

@@ -34 +34 @@
 MDEFINES = /f win32.mak
 
-OTHERDIRS = packages\windows\gdbm\gdbm packages\windows\crypt\crypt packages\windows\expat\expat \
-            packages\mg\lib src\mgpp\lib lib src\colservr
+OTHERDIRS = packages\windows\gdbm\gdbm packages\windows\crypt\crypt \
+      packages\windows\expat\expat lib src\colservr
 
-INSTALLDIRS = packages\mg\src\text src\mgpp\text src\recpt src\oaiservr \
-          src\hashfile src\db2txt src\txt2db src\phind\generate
+INSTALLDIRS = src\hashfile src\db2txt src\txt2db src\phind\generate \
+        src\recpt src\oaiservr 
+          
 
 YAZ_DIR = packages\yaz\yaz-2.1.4\win
+INDEXERSDIR = indexers
 
 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
@@ -64 +66 @@
 MAKECLEANCMD = $(MAKE) $(MDEFINES) clean
 
-all: win32.mak $(OTHERDIRS) $(YAZ_DIRS) $(INSTALLDIRS) 
+all: win32.mak $(INDEXERSDIR) $(OTHERDIRS) $(YAZ_DIRS) $(INSTALLDIRS) 
 
-install: win32.mak $(INSTALLDIRS)
+install: win32.mak $(INDEXERSDIR) $(INSTALLDIRS)
 
 clean:
@@ -117 +119 @@
     $(MAKECLEANCMD)
     cd "$(GSDLHOME)"
-
+    cd indexers
+    call winMake.bat clean
+    cd "$(GSDLHOME)"
 
 $(OTHERDIRS): FORCE
@@ -135 +139 @@
     cd "$(GSDLHOME)"
 
+$(INDEXERSDIR): FORCE
+    cd "$@"
+    call winMake.bat all nojava
+    call winMake.bat install nojava
+    copy bin\*.exe "$(GSDLHOME)\bin\windows"
+    cd "$(GSDLHOME)"
+
 FORCE: