Changeset 15551 for gsdl/trunk/src/gdbmedit/txt2db/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/gdbmedit/txt2db/Makefile.in (modified) (5 diffs)

gsdl/trunk/src/gdbmedit/txt2db/Makefile.in

@@ -29 +29 @@
 AR = ar
 CC = @CC@
-CPP = @CXX@
-CCFLAGS = -Wall @CFLAGS@
+CXX = @CXX@
+CFLAGS = -Wall @CFLAGS@ @COMPAT32BITFLAGS@
+CXXFLAGS = -Wall @CXXFLAGS@ @COMPAT32BITFLAGS@
 DEFS = @DEFS@
 RANLIB = @RANLIB@
 INCLUDES = -I../../../lib @GDBM_INCLUDE@
-LDFLAGS = @LDFLAGS@ 
+LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
 INDEXERS_DIR=../../../indexers
 DPLIBS = ../../../lib/gsdllib.a $(INDEXERS_DIR)/mg/lib/unitool.o
@@ -41 +42 @@
 INSTALL = @INSTALL@
  
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
-CPPCOMPILE = $(CPP) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
+CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
 MCOMPILE = ../../../bin/linux/mico-c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
 LINK = $(CC) $(LDFLAGS) -o $@
 MLINK = ../../../bin/linux/mico-ld $(LDFLAGS) -lmico2.2.7 -o $@
-CPPLINK = $(CPP) $(LDFLAGS) -o $@
+CXXLINK = $(CXX) $(LDFLAGS) -o $@
  
 .SUFFIXES:
@@ -55 +56 @@
 .SUFFIXES: .cpp .o
 .cpp.o:
-    $(CPPCOMPILE) $< 
+    $(CXXCOMPILE) $< 
  
 .SUFFIXES: .mpp .o
@@ -82 +83 @@
 
 depend:
-    makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
+    makedepend -Y -- $(DEFS) $(INCLUDES) $(CFLAGS) -- $(SOURCES)
 
 
@@ -90 +91 @@
 
 txt2db: $(TXT2DB_OBJS) $(DPLIBS)
-    $(CPPLINK) $(TXT2DB_OBJS) $(LIBS)
+    $(CXXLINK) $(TXT2DB_OBJS) $(LIBS)