Changeset 3929 for trunk/indexers/mgpp/lib

Timestamp:

2003-03-19T15:45:11+12:00 (21 years ago)

Author:

mdewsnip

Message:

Modified to be more independent of GS2.

File:

• trunk/indexers/mgpp/lib/WIN32.MAK (modified) (6 diffs)

trunk/indexers/mgpp/lib/WIN32.MAK

@@ -1 +1 @@
 ###########################################################################
 #
-# win32 makefile -- mgpp\text
+# win32 makefile -- mgpp\lib
 # A component of the Greenstone digital library software
 # from the New Zealand Digital Library Project at the
 # University of Waikato, New Zealand.
 #
-# Copyright (C) 2000  The New Zealand Digital Library Project
+# Copyright (C) 1999  The New Zealand Digital Library Project
 #
 #
@@ -25 +25 @@
 ###########################################################################
 
-GSDLHOME = ..\..\..
-USE_STLPORT = 0
+MGPPHOME = ..
 
-STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
+AR = lib
+CC = cl
+CPPFLAGS = 
 
-CC = cl
-CPPFLAGS =
-DEFS = -DSHORT_SUFFIX -DSILENT -DHAVE_CONFIG_H -D__WIN32__
-INCLUDES = -I"$(GSDLHOME)"
-!IF $(USE_STLPORT)
-DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
-INCLUDES = $(INCLUDES) -I$(STLPATH)
-!ENDIF
+DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -DSHORT_SUFFIX
+INCLUDES = -I"." -I"$(MGPPHOME)"
 
-LDFLAGS =
-
-LIBS = 
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES)
-LINK = $(CC) $(LDFLAGS)
+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS)
 
 .SUFFIXES:
-.SUFFIXES: .c .obj .cpp
+.SUFFIXES: .c .cpp .obj
 .c.obj:
     $(COMPILE) $<
@@ -53 +43 @@
     $(COMPILE) $<
 
+ANSI2KNR = 
 o = .obj
 
@@ -61 +52 @@
     bitio_m.h          huffman.h  \
     bitio_m_mem.h      perf_hash.h \
-    bitio_m_mems.h     getopt_old.h \
+    bitio_m_mems.h      \
     pathmax.h          getpagesize.h      sysfuncs.h         bitio_m_abstract.h  \
     random.h           simplefrenchstem.h unitool.h      longlong.h \
-    non_ansi.h
+    non_ansi.h         getopt_old.h       win32in.h
+
 
 SOURCES = \
@@ -75 +67 @@
     ftruncate.cpp     strcasecmp.cpp    random.cpp \
     simplefrenchstem.cpp                unitool.cpp       bitio_m_random.cpp \
-    bitio_m_abstract.cpp getopt_old.c
+    bitio_m_abstract.cpp                getopt_old.c      win32in.c
+# memlib.cpp removed
+
 
 OBJECTS =  mgheap$o   \
@@ -84 +78 @@
     xmalloc$o         bitio_m_random$o  bitio_m_abstract$o \
      random$o          simplefrenchstem$o \
-    unitool$o  win32in$o getopt_old$o
+    unitool$o         getopt_old$o      win32in$o
 
-all : libmg.lib
+ 
+DISTFILES = Makefile.in $(HEADERS) $(SOURCES)
+ 
+all : libmgpp.lib
 
-libmg.lib: $(OBJECTS)
-    if EXIST libmg.lib del libmg.lib
-    lib /out:libmg.lib $(OBJECTS)
+libmgpp.lib : $(OBJECTS)
+    if EXIST libmgpp.lib del libmgpp.lib
+    $(AR) /out:libmgpp.lib $(OBJECTS)
 
+$(OBJECTS): "$(MGPPHOME)\win32cfg.h"
+
+install: 
 clean:
     del *$o 
-    del libmg.lib
-
-install:
+    del libmgpp.lib