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

diff --git a/swcsa/Makefile b/swcsa/Makefile
index 1d731af..cdd5672 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 ##############################
@@ -34,10 +44,10 @@ intIndexPackage:
 
 ####################### UTILS MODULES #################################
 
-parameters.o: 
-	$(CC) $(CFLAGS) -c $(SRCDIRUTILS)/parameters.c 
+parameters.o:
+	$(CC) $(CFLAGS) -c $(SRCDIRUTILS)/parameters.c
 
-fileInfo.o:  
+fileInfo.o:
 	$(CC) $(CFLAGS) -c $(SRCDIRUTILS)/fileInfo.c
 
 hash.o: MemoryManager.o
@@ -47,28 +57,28 @@ hash.o: MemoryManager.o
 MemoryManager.o:
 	$(CC) $(CFLAGS) -c $(SRCDIRUTILS)/MemoryManager.c
 
-valstring.o:  
-	$(CC) $(CFLAGS) -c $(SRCDIRUTILS)/valstring.c	
+valstring.o:
+	$(CC) $(CFLAGS) -c $(SRCDIRUTILS)/valstring.c
 
-huff.o: 
+huff.o:
 	$(CC) $(CFLAGS) -c $(SRCDIRUTILS)/huff.c
 
-huffDec.o: 
+huffDec.o:
 	$(CC) $(CFLAGS) -c $(SRCDIRUTILS)/huffDec.c
 
 
-basics.o: 
+basics.o:
 	$(CC) $(CFLAGS) -c $(SRCDIRUTILS)/basics.c
 
-bitmap.o: 
+bitmap.o:
 	$(CC) $(CFLAGS) -c $(SRCDIRUTILS)/bitmap.c
 
 
 ############################ CLEANING #################################
 
-cleanO: 
+cleanO:
 	rm -f *.o
-	
+
 clean:
 	cd  $(SRCDIRCSA) && $(MAKE) clean -w
 	rm -rf *~ *% *.o core *.bak $(LIBINTINDEX) $(LIBINDEX)