X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=swcsa%2FMakefile;h=1d07e369dd8eb7c5290c40b71c9d8e6711141eaf;hb=25d3dd967bced59699ef5cf3e54d3eff8a6ae883;hp=1d731af8dd9a2cee2e1ddc0804904758992f03c5;hpb=102e33b134075765e6d4e0c38bc1307568ce5602;p=SXSI%2FTextCollection.git

diff --git a/swcsa/Makefile b/swcsa/Makefile
index 1d731af..1d07e36 100644
--- a/swcsa/Makefile
+++ b/swcsa/Makefile
@@ -2,7 +2,11 @@ SRCDIRUTILS = utils
 SRCDIRCSA   = intIndex
 CC          = g++
 
-# If you have trouble with make, e.g.:
+export CFLAGS  = -O9 -D_FORTIFY_SOURCE=0
+#export CFLAGS  = -O9 -m32 -L. -g -D_FORTIFY_SOURCE=0
+
+# Original settings:
+# If you have trouble with -m32, e.g.:
 #    /usr/bin/ld: skipping incompatible /usr/lib/gcc/x86_64-linux-gnu/4.4.3/libstdc++.a when searching for -lstdc++
 #    ...
 # try adding
@@ -10,7 +14,7 @@ CC          = g++
 #
 # The filename libstdc++.so.6.0.13 is probably different
 # but any from /usr/lib32 is fine.
-export CFLAGS  = -O9 -m32 -L. -D_FORTIFY_SOURCE=0
+#export CFLAGS  = -O9 -m32 -L. -D_FORTIFY_SOURCE=0
 #export CFLAGS      = -O0 -m32 -pg
 #export CFLAGS      = -g -m32 -O0
 
@@ -21,8 +25,14 @@ all: clean wcsa cleanO
 
 wcsa: intIndexPackage buildFacade.o parameters.o hash.o valstring.o MemoryManager.o basics.o \
 		bitmap.o huffDec.o huff.o fileInfo.o
-	ar rc $(LIBINTINDEX) parameters.o buildFacade.o hash.o valstring.o MemoryManager.o basics.o \
-		bitmap.o huffDec.o huff.o fileInfo.o 
+	mv hash.o hashswcsa.o
+	mv basics.o basicsswcsa.o
+	mv huff.o huffswcsa.o
+	mv huffDec.o huffDecswcsa.o
+	mv bitmap.o bitmapswcsa.o
+	mv parameters.o parametswcsa.o
+	ar rc $(LIBINTINDEX) parametswcsa.o buildFacade.o hashswcsa.o valstring.o MemoryManager.o basicsswcsa.o \
+		bitmapswcsa.o huffDecswcsa.o huffswcsa.o fileInfo.o 
 	mv $(LIBINTINDEX) $(LIBINDEX)
 
 ################# SELF INDEX ON INTEGERS ##############################