Changeset 2941

Timestamp:

2002-02-04T11:56:13+13:00 (22 years ago)

Author:

jrm21

Message:

Renamed variables CPP to CXX, as cpp means "pre-processor", not "plus-plus".
This is to give consistency to the flags given to the c++ compiler across
greenstone sub-directories.

Location:

trunk/gsdl/src

Files:

• mgpp/lib/Makefile.in (modified) (3 diffs)
• recpt/Makefile.in (modified) (6 diffs)

trunk/gsdl/src/mgpp/lib/Makefile.in

@@ -33 +33 @@
 AR = ar
 CC = @CC@
-CPP = @CXX@
+CXX = @CXX@
 ifneq ($(NZDL), 1)
 CFLAGS = @CFLAGS@ -ansi
@@ -39 +39 @@
 CFLAGS = @CFLAGS@ -ansi -DSILENT
 endif
-CPPFLAGS = @CPPFLAGS@
+CXXFLAGS = @CXXFLAGS@
 DEFS = @DEFS@
 RANLIB = @RANLIB@
@@ -48 +48 @@
  
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES)  $(CFLAGS)
-CPPCOMPILE = $(CPP) -c $(DEFS) $(INCLUDES) $(CPPFLAGS)
+CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
  
 .SUFFIXES:

trunk/gsdl/src/recpt/Makefile.in

@@ -43 +43 @@
 AR = ar
 CC = @CC@
-CPP = @CXX@
+CXX = @CXX@
 #CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual
 
-CCFLAGS = $(Z_CFLAGS) $(CORBA_CFLAGS) @CFLAGS@
+CXXFLAGS = $(Z_CFLAGS) $(CORBA_CFLAGS) @CXXFLAGS@
 
 # YAZ kit for z39.50
@@ -92 +92 @@
 LINK = $(CC) $(LDFLAGS) -o $@
 
-CPPCOMPILE = $(CPP) -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
@@ -120 +120 @@
 .SUFFIXES: .cpp .o
 .cpp.o:
-    $(CPPCOMPILE) $< 
+    $(CXXCOMPILE) $< 
 
 $(GDBM_OBJS) :%.o :%.cpp
-    $(CPPCOMPILE) @GDBM_INCLUDE@ $<
+    $(CXXCOMPILE) @GDBM_INCLUDE@ $<
 
 .SUFFIXES: .mpp .o
@@ -268 +268 @@
 
 depend:
-    makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
+    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -286 +286 @@
 
 recpt: $(RECPT_OBJS)
-    $(CPPLINK) $(RECPT_OBJS) $(LIBS) 
+    $(CXXLINK) $(RECPT_OBJS) $(LIBS) 
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -305 +305 @@
 
 library: $(LIBRARY_OBJS)
-    $(CPPLINK) $(LIBRARY_OBJS) $(LIBS)
+    $(CXXLINK) $(LIBRARY_OBJS) $(LIBS)
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #