Changeset 15551 for gsdl/trunk/src/recpt/Makefile.in

Timestamp:

2008-05-17T10:01:24+12:00 (16 years ago)

Author:

davidb

Message:

Introduction of COMPAT32BITFLAGS to confirugre and Makefile.in files to help compile Greenstone on a 64-bit machine

File:

• gsdl/trunk/src/recpt/Makefile.in (modified) (5 diffs)

gsdl/trunk/src/recpt/Makefile.in

@@ -63 +63 @@
 
 
-CPP = @CXX@
-CPPFLAGS = @CXXFLAGS@
+CC = @CC@
+CFLAGS=@CFLAGS@ @COMPAT32BITFLAGS@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(Z3950_DEFS)
 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
@@ -70 +72 @@
         -I$(PACKAGES_DIR)/expat/include $(FASTCGI_INCLUDES) $(Z3950_INCLUDES)
 INSTALL = @INSTALL@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
 LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \
     $(FASTCGI_LIBS) $(Z3950_LIBS)
 
 
-CPPCOMPILE = $(CPP) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
-CPPLINK = $(CPP) $(LDFLAGS) -o $@
+CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
+CXXLINK = $(CXX) $(LDFLAGS) -o $@
 
 
@@ -82 +84 @@
 .SUFFIXES: .cpp .o
 .cpp.o:
-    $(CPPCOMPILE) $< 
+    $(CXXCOMPILE) $< 
 
 
@@ -190 +192 @@
 
 library: $(EXECUTABLE_OBJECTS)
-    $(CPPLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
+    $(CXXLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
 
 all: $(EXECUTABLE)
@@ -204 +206 @@
 
 depend:
-    makedepend -Y -- $(DEFS) $(INCLUDES) $(CPPFLAGS) -- $(SOURCES)
+    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)