Changeset 2501

Timestamp:

2001-06-06T16:52:17+12:00 (23 years ago)

Author:

sjboddie

Message:

a few changes to various makefiles, mostly with regard to the phind stuff
which is now compiled in by default

Location:

trunk/gsdl

Files:

• src/phind/generate/Makefile.in (modified) (1 diff)
• src/phind/generate/win32.mak (modified) (2 diffs)
• src/recpt/win32.mak (modified) (5 diffs)
• src/w32server/win32.mak (modified) (2 diffs)
• win32.mak (modified) (1 diff)

trunk/gsdl/src/phind/generate/Makefile.in

@@ -56 +56 @@
 all : $(EXEC)
 
-# Phind is still experimental, so it is not installed by default.  
-# An explicit "make install-phind" is required to get it on your system.
-install :
-
-
-install-phind : $(EXEC)
+install : $(EXEC)
     install -d $(GSDLHOME)/bin/$(GSDLOS)
     install -m 775 -s $(EXEC) $(GSDLHOME)/bin/$(GSDLOS)

trunk/gsdl/src/phind/generate/win32.mak

@@ -33 +33 @@
 CPPFLAGS =
 LDFLAGS =
-DEFS =
+DEFS = -D__WIN32__
 INCLUDES =
 !IF $(USE_STLPORT)
@@ -55 +55 @@
 HEADERS = suffix.h phrase.h
 SOURCES = suffix.cpp phrase.cpp
-OBJECTS = phrase.obj
+OBJECTS = phrase.obj suffix.obj
 EXEC    = suffix.exe
 
+all: $(EXEC)
+
+install:
+    copy $(EXEC) "$(GSDLHOME)\bin\windows"
+
+clean:
+    del *.obj
+    del $(EXEC)
 
 suffix.exe: $(OBJECTS)

trunk/gsdl/src/recpt/win32.mak

@@ -38 +38 @@
        -I"$(GSDLHOME)\packages\mg" -I"$(GSDLHOME)\packages\mg\lib" \
        -I"$(GSDLHOME)\packages\mg\src\text" -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" \
-       -I"$(GSDLHOME)\packages\windows\crypt\crypt"
+       -I"$(GSDLHOME)\packages\windows\crypt\crypt" -I"$(GSDLHOME)\src\mgpp\lib" \
+       -I"$(GSDLHOME)\src\mgpp\text" -I"$(GSDLHOME)"
 !IF $(USE_STLPORT)
 DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
@@ -52 +53 @@
        "$(GSDLHOME)\lib\gsdllib.lib" \
        "$(GSDLHOME)\packages\mg\src\text\libtextin.lib" \
-       "$(GSDLHOME)\packages\mg\lib\libmg.lib"
+       "$(GSDLHOME)\packages\mg\lib\libmg.lib" \
+       "$(GSDLHOME)\src\mgpp\text\libtextin.lib" \
+       "$(GSDLHOME)\src\mgpp\lib\libmg.lib"
 
 
@@ -76 +79 @@
         datelistbrowserclass.h invbrowserclass.h pagedbrowserclass.h \
         htmlbrowserclass.h historydb.h phindbrowserclass.h collectoraction.h \
-        nullproto.h argdb.h browseaction.h phindaction.h
+        nullproto.h argdb.h browseaction.h browseactiontools.h phindaction.h
 
 CGIHEADERS = cgiwrapper.h
@@ -92 +95 @@
         invbrowserclass.cpp pagedbrowserclass.cpp htmlbrowserclass.cpp \
         historydb.cpp phindbrowserclass.cpp collectoraction.cpp nullproto.cpp \
-        argdb.cpp browseaction.cpp phindaction.cpp
+        argdb.cpp browseaction.cpp browseactiontools.cpp phindaction.cpp
 
 CGISOURCES = librarymain.cpp cgiwrapper.cpp
@@ -108 +111 @@
         invbrowserclass.obj pagedbrowserclass.obj htmlbrowserclass.obj \
         historydb.obj phindbrowserclass.obj collectoraction.obj nullproto.obj \
-        argdb.obj browseaction.obj phindaction.obj
+        argdb.obj browseaction.obj browseactiontools.obj phindaction.obj
 
 CGIOBJECTS = librarymain.obj cgiwrapper.obj

trunk/gsdl/src/w32server/win32.mak

@@ -38 +38 @@
 INCLUDES = -I"$(GSDLHOME)\src\w32server" -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\lib" \
        -I"$(GSDLHOME)\src\colservr" -I"$(GSDLHOME)\packages\mg" \
-       -I"$(GSDLHOME)\packages\mg\lib" -I"$(GSDLHOME)\packages\mg\src\text"
+       -I"$(GSDLHOME)\packages\mg\lib" -I"$(GSDLHOME)\packages\mg\src\text" \
+       -I"$(GSDLHOME)\src\mgpp\lib" -I"$(GSDLHOME)\src\mgpp\text" -I"$(GSDLHOME)"
 !IF $(USE_STLPORT)
 DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
@@ -51 +52 @@
        "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib" \
        "$(GSDLHOME)\packages\windows\crypt\crypt\crypt.lib" \
+       "$(GSDLHOME)\src\mgpp\lib\libmg.lib" \
+       "$(GSDLHOME)\src\mgpp\text\libtextin.lib" \
        kernel32.lib user32.lib gdi32.lib winspool.lib \
        comdlg32.lib advapi32.lib shell32.lib ole32.lib \

trunk/gsdl/win32.mak

@@ -40 +40 @@
 
 OTHERDIRS = packages\windows\gdbm\gdbm packages\windows\crypt\crypt \
-            packages\mg\lib lib src\colservr
+            packages\mg\lib src\mgpp\lib lib src\colservr
 
-INSTALLDIRS = packages\mg\src\text src\txt2db src\db2txt \
-          src\hashfile src\recpt
+INSTALLDIRS = packages\mg\src\text src\mgpp\text src\txt2db src\db2txt \
+          src\hashfile src\phind\generate src\recpt
 
 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"