Changeset 25171 for main/trunk/greenstone2/common-src

Timestamp:

2012-03-02T11:02:23+13:00 (12 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:

• Makefile.in (modified) (1 diff)
• jni/Makefile.in (modified) (1 diff)
• lib/Makefile.in (modified) (1 diff)
• text/Makefile.in (modified) (1 diff)

main/trunk/greenstone2/common-src/indexers/mgpp/Makefile.in

@@ -29 +29 @@
 CC = @CC@
 CXX = @CXX@
-CFLAGS = @CFLAGS@ -ansi
+CFLAGS = @CFLAGS@ @ARCH_DEP_FLAGS@ -ansi
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@

main/trunk/greenstone2/common-src/indexers/mgpp/jni/Makefile.in

@@ -26 +26 @@
 CC = @CC@
 CXX = @CXX@
-CFLAGS = @CFLAGS@ -fPIC -ansi -DSILENT -DSHORT_SUFFIX
-CXXFLAGS = @CXXFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX
+CFLAGS = @CFLAGS@ -ansi @ARCH_DEP_FLAGS@ -DSILENT -DSHORT_SUFFIX
+CXXFLAGS = @CXXFLAGS@ @ARCH_DEP_FLAGS@ -DSILENT -DSHORT_SUFFIX
 DEFS = @DEFS@
 RANLIB = @RANLIB@

main/trunk/greenstone2/common-src/indexers/mgpp/lib/Makefile.in

@@ -36 +36 @@
 CXX = @CXX@
 ifneq ($(NZDL), 1)
-CFLAGS = @CFLAGS@ -ansi -fPIC
+CFLAGS = @CFLAGS@ -ansi @ARCH_DEP_FLAGS@
 else 
-CFLAGS = @CFLAGS@ -ansi -fPIC -DSILENT
+CFLAGS = @CFLAGS@ -ansi @ARCH_DEP_FLAGS@ -DSILENT
 endif
-CXXFLAGS = @CXXFLAGS@ -fPIC
+CXXFLAGS = @CXXFLAGS@ @ARCH_DEP_FLAGS@
 DEFS = @DEFS@
 RANLIB = @RANLIB@

main/trunk/greenstone2/common-src/indexers/mgpp/text/Makefile.in

@@ -53 +53 @@
 CC = @CC@
 CXX = @CXX@
-CFLAGS = @CFLAGS@ -ansi -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS)
-CXXFLAGS = @CXXFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS)
+CFLAGS = @CFLAGS@ -ansi @ARCH_DEP_FLAGS@ -DSILENT -DSHORT_SUFFIX $(AFFLAGS)
+CXXFLAGS = @CXXFLAGS@ @ARCH_DEP_FLAGS@ -DSILENT -DSHORT_SUFFIX $(AFFLAGS)
 DEFS = @DEFS@
 RANLIB = @RANLIB@