Changeset 15559

Show
Ignore:
Timestamp:
18.05.2008 22:13:36 (11 years ago)
Author:
davidb
Message:

Addition of COMPAT32BITFLAGS so mg and mgpp can compile on a 64-bit machine

Location:
indexers/trunk
Files:
10 modified

Legend:

Unmodified
Added
Removed
  • indexers/trunk/mg/Makefile.in

    r13802 r15559  
    2828 
    2929CC = @CC@ 
    30 CFLAGS = @CFLAGS@ -fpic  
     30CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic  
    3131INSTALL = @INSTALL@ 
    3232INSTALL_DATA = @INSTALL_DATA@ 
    3333INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    34 LDFLAGS = @LDFLAGS@ 
     34LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@  
    3535LIBS = @LIBS@   
    3636TOUCH = echo timestamp > 
  • indexers/trunk/mg/java/org/greenstone/mg/Makefile.in

    r10071 r15559  
    1717JAVAH = $(JAVA_HOME)/bin/javah 
    1818JAR = $(JAVA_HOME)/bin/jar 
    19 CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX 
    20 CXXFLAGS = @CXXFLAGS@ -DSILENT -DSHORT_SUFFIX 
     19CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX 
     20CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -DSILENT -DSHORT_SUFFIX 
    2121DEFS = @DEFS@ 
    2222RANLIB = @RANLIB@ 
     
    2424INSTALL_DATA = @INSTALL_DATA@ 
    2525INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    26 LDFLAGS = @LDFLAGS@ 
     26LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    2727LIBS =  -lstdc++ @LIBS@ 
    2828TOUCH = echo timestamp > 
  • indexers/trunk/mg/jni/Makefile.in

    r14481 r15559  
    1313AR = ar 
    1414CC = @CC@ 
    15 CFLAGS = @CFLAGS@ -ansi -fpic -DSILENT -DSHORT_SUFFIX -DNZDL -DQUIET -DPARADOCNUM 
     15CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -fpic -DSILENT -DSHORT_SUFFIX -DNZDL -DQUIET -DPARADOCNUM 
    1616DEFS = @DEFS@ 
    1717RANLIB = @RANLIB@ 
     
    1919INSTALL_DATA = @INSTALL_DATA@ 
    2020INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    21 LDFLAGS = @LDFLAGS@ 
     21LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    2222#NOTE: libmgtext.a needs to come before libmglib.a !!! 
    2323QUERY_LIBS = ../src/text/libmgtext.a ../lib/libmglib.a @LIBS@ 
  • indexers/trunk/mg/lib/Makefile.in

    r13757 r15559  
    3333AR = ar 
    3434CC = @CC@ 
    35 CFLAGS = @CFLAGS@ -fpic  
     35CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic  
    3636DEFS = @DEFS@ 
    3737RANLIB = @RANLIB@ 
     
    4040# Uncomment for compiling for the nzdl project 
    4141# 
    42 CFLAGS = @CFLAGS@ -DQUIET -fpic 
     42CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -DQUIET -fpic 
    4343########################################## 
    4444 
  • indexers/trunk/mg/src/images/Makefile.in

    r13757 r15559  
    3636  
    3737CC = @CC@ 
    38 CFLAGS = @CFLAGS@  
     38CFLAGS = @CFLAGS@  @COMPAT32BITFLAGS@ 
    3939CPPFLAGS = @CPPFLAGS@ 
    4040DEFS = @DEFS@ 
     
    4242INSTALL_DATA = @INSTALL_DATA@ 
    4343INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    44 LDFLAGS = @LDFLAGS@ 
     44LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    4545LIBS = ../../lib/libmglib.a @LIBS@ 
    4646TOUCH = echo timestamp > 
  • indexers/trunk/mg/src/text/Makefile.in

    r13761 r15559  
    3737AR = ar 
    3838CC = @CC@ 
    39 CFLAGS = @CFLAGS@ -fpic 
     39CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic 
    4040DEFS = @DEFS@ 
    4141RANLIB = @RANLIB@ 
     
    4343INSTALL_DATA = @INSTALL_DATA@ 
    4444INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    45 LDFLAGS = @LDFLAGS@ 
     45LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    4646LIBS = ../../lib/libmglib.a @LIBS@ 
    4747TOUCH = echo timestamp > 
     
    5252# Uncomment for compiling for the nzdl project 
    5353# 
    54 CFLAGS = @CFLAGS@ -fpic -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM 
     54CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM 
    5555########################################## 
    5656 
  • indexers/trunk/mgpp/Makefile.in

    r15022 r15559  
    2929CC = @CC@ 
    3030CXX = @CXX@ 
    31 CFLAGS = @CFLAGS@ -ansi 
     31CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi 
    3232INSTALL = @INSTALL@ 
    3333INSTALL_DATA = @INSTALL_DATA@ 
    3434INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    35 LDFLAGS = @LDFLAGS@ 
     35LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    3636LIBS = @LIBS@   
    3737TOUCH = echo timestamp > 
  • indexers/trunk/mgpp/java/org/greenstone/mgpp/Makefile.in

    r10072 r15559  
    1717JAVAH = $(JAVA_HOME)/bin/javah 
    1818JAR = $(JAVA_HOME)/bin/jar 
    19 CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX 
    20 CXXFLAGS = @CXXFLAGS@ -DSILENT -DSHORT_SUFFIX 
     19CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX 
     20CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -DSILENT -DSHORT_SUFFIX 
    2121DEFS = @DEFS@ 
    2222RANLIB = @RANLIB@ 
     
    2424INSTALL_DATA = @INSTALL_DATA@ 
    2525INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    26 LDFLAGS = @LDFLAGS@ 
     26LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    2727LIBS =  -lstdc++ @LIBS@ 
    2828TOUCH = echo timestamp > 
  • indexers/trunk/mgpp/lib/Makefile.in

    r13629 r15559  
    3535CXX = @CXX@ 
    3636ifneq ($(NZDL), 1) 
    37 CFLAGS = @CFLAGS@ -ansi -fPIC 
     37CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -fPIC 
    3838else  
    39 CFLAGS = @CFLAGS@ -ansi -fPIC -DSILENT 
     39CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -fPIC -DSILENT 
    4040endif 
    41 CXXFLAGS = @CXXFLAGS@ -fPIC 
     41CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -fPIC 
    4242DEFS = @DEFS@ 
    4343RANLIB = @RANLIB@ 
  • indexers/trunk/mgpp/text/Makefile.in

    r15022 r15559  
    5353CC = @CC@ 
    5454CXX = @CXX@ 
    55 CFLAGS = @CFLAGS@ -ansi -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS) 
    56 CXXFLAGS = @CXXFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS) 
     55CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS) 
     56CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS) 
    5757DEFS = @DEFS@ 
    5858RANLIB = @RANLIB@ 
     
    6060INSTALL_DATA = @INSTALL_DATA@ 
    6161INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    62 LDFLAGS = @LDFLAGS@ 
     62LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    6363LIBS = ../lib/libmgpplib.a $(AFLIBS) -lstdc++ @LIBS@ 
    6464TOUCH = echo timestamp >