Changeset 25171

Show
Ignore:
Timestamp:
02.03.2012 11:02:23 (8 years ago)
Author:
jmt12
Message:

Removing hardcoded -fpic in Makefile.in (presumably snuck in during merge of 64bit branch) and replacing with proper use of Kathy's ARCH_DEP_FLAGS variable

Location:
main/trunk/greenstone2/common-src/indexers/mgpp
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/indexers/mgpp/Makefile.in

    r25147 r25171  
    2929CC = @CC@ 
    3030CXX = @CXX@ 
    31 CFLAGS = @CFLAGS@ -ansi 
     31CFLAGS = @CFLAGS@ @ARCH_DEP_FLAGS@ -ansi 
    3232INSTALL = @INSTALL@ 
    3333INSTALL_DATA = @INSTALL_DATA@ 
  • main/trunk/greenstone2/common-src/indexers/mgpp/jni/Makefile.in

    r25147 r25171  
    2626CC = @CC@ 
    2727CXX = @CXX@ 
    28 CFLAGS = @CFLAGS@ -fPIC -ansi -DSILENT -DSHORT_SUFFIX 
    29 CXXFLAGS = @CXXFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX 
     28CFLAGS = @CFLAGS@ -ansi @ARCH_DEP_FLAGS@ -DSILENT -DSHORT_SUFFIX 
     29CXXFLAGS = @CXXFLAGS@ @ARCH_DEP_FLAGS@ -DSILENT -DSHORT_SUFFIX 
    3030DEFS = @DEFS@ 
    3131RANLIB = @RANLIB@ 
  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/Makefile.in

    r25147 r25171  
    3636CXX = @CXX@ 
    3737ifneq ($(NZDL), 1) 
    38 CFLAGS = @CFLAGS@ -ansi -fPIC 
     38CFLAGS = @CFLAGS@ -ansi @ARCH_DEP_FLAGS@ 
    3939else  
    40 CFLAGS = @CFLAGS@ -ansi -fPIC -DSILENT 
     40CFLAGS = @CFLAGS@ -ansi @ARCH_DEP_FLAGS@ -DSILENT 
    4141endif 
    42 CXXFLAGS = @CXXFLAGS@ -fPIC 
     42CXXFLAGS = @CXXFLAGS@ @ARCH_DEP_FLAGS@ 
    4343DEFS = @DEFS@ 
    4444RANLIB = @RANLIB@ 
  • main/trunk/greenstone2/common-src/indexers/mgpp/text/Makefile.in

    r25147 r25171  
    5353CC = @CC@ 
    5454CXX = @CXX@ 
    55 CFLAGS = @CFLAGS@ -ansi -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS) 
    56 CXXFLAGS = @CXXFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS) 
     55CFLAGS = @CFLAGS@ -ansi @ARCH_DEP_FLAGS@ -DSILENT -DSHORT_SUFFIX $(AFFLAGS) 
     56CXXFLAGS = @CXXFLAGS@ @ARCH_DEP_FLAGS@ -DSILENT -DSHORT_SUFFIX $(AFFLAGS) 
    5757DEFS = @DEFS@ 
    5858RANLIB = @RANLIB@