Changeset 2703 for trunk/gsdl/src/colservr/Makefile.in

Timestamp:

2001-08-15T14:11:17+12:00 (23 years ago)

Author:

jrm21

Message:

Updated to successfully make with Kathy's latest changes (some files need
both mg and mgpp headers at the same time). Also cleaned up all the CC/CXX
variable names.

File:

• trunk/gsdl/src/colservr/Makefile.in (modified) (6 diffs)

trunk/gsdl/src/colservr/Makefile.in

@@ -28 +28 @@
 AR = ar
 CC = @CC@
-CPP = @CXX@
-#CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual
-CCFLAGS = @CFLAGS@
+CXX = @CXX@
+CFLAGS = @CFLAGS@
+CXXFLAGS = @CXXFLAGS@
 MCFLAGS = @CFLAGS@ -Wall -Wunused
 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@
@@ -93 +93 @@
 
 
-COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
-LINK = $(CPP) $(LDFLAGS) -o $@
+COMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES)
+LINK = $(CXX) $(LDFLAGS) -o $@
 
-CPPCOMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
-CPPLINK = $(CPP) $(LDFLAGS) -o $@
+CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
+CXXLINK = $(CXX) $(LDFLAGS) -o $@
 
 MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
@@ -109 +109 @@
 .SUFFIXES: .cpp .o
 .cpp.o:
-    $(CPPCOMPILE) $< 
+    $(CXXCOMPILE) $< 
 
 .SUFFIXES: .mpp .o
@@ -128 +128 @@
 endif
 
+# following objects need both mg and mgpp stuff - jrm21
+MG_MGPP_OBJECTS=collectset.o
+
 HEADERS = search.h querycache.h queryinfo.h collectserver.h collectset.h \
           colservrconfig.h maptools.h filter.h source.h browsefilter.h \
@@ -142 +145 @@
           colservrconfig.o maptools.o filter.o source.o browsefilter.o \
           queryfilter.o mggdbmsource.o phrasesearch.o phrasequeryfilter.o \
-      collectset.o $(MG_OBJECTS) $(CORBAOBJECTS)
+      $(MG_MGPP_OBJECTS) $(MG_OBJECTS) $(CORBAOBJECTS)
 
 all : $(OBJECTS)
@@ -154 +157 @@
 install:
 
+# needs IndexData.h from mgpp...
+$(MG_MGPP_OBJECTS): %.o : %.cpp
+    $(CXXCOMPILE) -I../mgpp/text -I../mgpp/lib -o $@ $<
+
 depend:
-    makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
+    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)