Changeset 13858

Timestamp:

2007-02-05T16:53:18+13:00 (17 years ago)

Author:

kjdon

Message:

modified windows makefiles to use new indexers package

Location:

trunk/gs2build-extra

Files:

• lib.win32.mak (modified) (1 diff)
• win32.mak (modified) (3 diffs)

trunk/gs2build-extra/lib.win32.mak

@@ -45 +45 @@
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN \
        -DSHORT_SUFFIX
-INCLUDES = -I"$(GSDLHOME)" -I"$(GSDLHOME)\packages\mg\lib"
+INCLUDES = -I"$(GSDLHOME)" -I"$(GSDLHOME)\indexers\mg\lib"
 !IF $(USE_STLPORT)
 DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS

trunk/gs2build-extra/win32.mak

@@ -41 +41 @@
 OBJECTS = 
 
-OTHERDIRS = packages\windows\gdbm\gdbm packages\windows\crypt\crypt \
-            packages\mg\lib src\mgpp\lib lib 
+OTHERDIRS = packages\windows\gdbm\gdbm packages\windows\crypt\crypt lib 
 
-INSTALLDIRS = packages\mg\src\text src\mgpp\text src\txt2db src\db2txt src\hashfile src\phind\generate
+INSTALLDIRS = src\txt2db src\db2txt src\hashfile src\phind\generate
 
 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
@@ -58 +57 @@
 
 all: win32.mak $(OTHERDIRS) $(INSTALLDIRS)
+    cd indexers
+    call winMake.bat all
+    cd ..
 
 install: win32.mak $(INSTALLDIRS)
+    cd indexers
+    call winMake.bat install
+    cd ..
 
 $(OTHERDIRS): FORCE
@@ -81 +86 @@
     $(MAKECMD) clean
     cd ..\..\..\..
-    cd packages\mg\lib
-    $(MAKECMD) clean
-    cd ..\..\..
-    cd packages\mg\src\text
-    $(MAKECMD) clean
-    cd ..\..\..\..
-    cd src\mgpp\lib
-    $(MAKECMD) clean
-    cd ..\..\..
-    cd src\mgpp\text
-    $(MAKECMD) clean
-    cd ..\..\..
+    cd indexers
+    call winMake.bat clean
+    cd ..
     cd lib
     $(MAKECMD) clean