Update swcs with larson-sadakane suffix array construction method.

[SXSI/TextCollection.git] / swcsa / intIndex / Makefile

diff --git a/swcsa/intIndex/Makefile b/swcsa/intIndex/Makefile
index 8f02954..0585c6e 100755 (executable)
--- a/swcsa/intIndex/Makefile
+++ b/swcsa/intIndex/Makefile
@@ -1,12 +1,13 @@
 SRCDIR = .
 SRCDIRCSA = .
+SRCDIRCSAUTILS = ../intIndexUtils
 SRCDIRUTILS = ../utils
 CC          = g++
 
 ifndef CFLAGS  ##possibly already defined by the "main Makefile".
        ##CFLAGS = -O9 -m32
-       CFLAGS      = -O9 -m32
-       ##CFLAGS      = -g -m32 -O0
+       ##CFLAGS      = -O9 -m32 
+       CFLAGS      = -g -m32 -O0
 endif
 
 LIBINTINDEX    = icsa.a
@@ -15,41 +16,41 @@ all: intIndex cleanO
 
 
 intIndex: icsa.o parameters.o basics.o huff.o bitmap.o psiHuffmanRLE.o psiDeltaCode.o psiGonzalo.o
-       ar rc $(LIBINTINDEX) icsa.o psiHuffmanRLE.o psiDeltaCode.o psiGonzalo.o
+       ar rc $(LIBINTINDEX) icsa.o psiHuffmanRLE.o psiDeltaCode.o psiGonzalo.o  
                        #not including "parameters.o basics.o bitmap.o huff.o" as they are included by wcsa
                        #they are already included into the library by the presentation layer.
 
-icsa.o: parameters.o basics.o bitmap.o huff.o psiHuffmanRLE.o psiDeltaCode.o psiGonzalo.o
-        $(CC) $(CFLAGS) -c $(SRCDIR)/$(SRCDIRCSA)/icsa.c
+icsa.o: parameters.o basics.o bitmap.o huff.o psiHuffmanRLE.o psiDeltaCode.o psiGonzalo.o 
+        $(CC) $(CFLAGS) -c $(SRCDIR)/$(SRCDIRCSA)/icsa.c 
 
 psiHuffmanRLE.o: huff.o
-       $(CC) $(CFLAGS) -c $(SRCDIR)/$(SRCDIRCSA)/psiHuffmanRLE.c
+       $(CC) $(CFLAGS) -c $(SRCDIR)/$(SRCDIRCSAUTILS)/psiHuffmanRLE.c 
 
 psiDeltaCode.o:
-       $(CC) $(CFLAGS) -c $(SRCDIR)/$(SRCDIRCSA)/psiDeltaCode.c
+       $(CC) $(CFLAGS) -c $(SRCDIR)/$(SRCDIRCSAUTILS)/psiDeltaCode.c 
 
 psiGonzalo.o: huff.o
-       $(CC) $(CFLAGS) -c $(SRCDIR)/$(SRCDIRCSA)/psiGonzalo.c
+       $(CC) $(CFLAGS) -c $(SRCDIR)/$(SRCDIRCSAUTILS)/psiGonzalo.c 
 
-parameters.o:
-       $(CC) $(CFLAGS) -c $(SRCDIR)/$(SRCDIRUTILS)/parameters.c
-
-
-huff.o:
+parameters.o: 
+       $(CC) $(CFLAGS) -c $(SRCDIR)/$(SRCDIRUTILS)/parameters.c 
+       
+       
+huff.o: 
        $(CC) $(CFLAGS) -c $(SRCDIR)/$(SRCDIRUTILS)/huff.c
 
-basics.o:
+basics.o: 
        $(CC) $(CFLAGS) -c $(SRCDIR)/$(SRCDIRUTILS)/basics.c
 
-bitmap.o:
+bitmap.o: 
        $(CC) $(CFLAGS) -c $(SRCDIR)/$(SRCDIRUTILS)/bitmap.c
 
 
-cleanO:
+cleanO: 
        rm -f *.o
-
+       
 clean:
-       rm -rf *~ *% *.o core *.bak icsa.a
+       rm -rf *~ *% *.o core *.bak icsa.a 
 
 tar:
        tar czvf icsa.tar.gz  Makefile