Resuelvo conflicto en informe y subo una actualización mínima. Let the tests begin

[z.facultad/75.06/jacu.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index a046cdeeb42e2c53a90d35d3558f4a8df1f2c0ce..dac90ba1a97f3e8bd380e63311e3b18378565eca 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -25,11 +25,14 @@
 #
 
 TARGETS=jacu
-COMMON=mtf/mtf.o blocksorting/bs.o statichuff/statichuff.o vfile/vfile.o vfile/common.o
-SRCS=jacu.c
+COMMON=zerogrouping/zerogrouping.o mtf/mtf.o blocksorting/bs.o \
+       statichuff/statichuff.o vfile/vfile.o vfile/common.o
+SRCS=jacu.c zerogrouping/zerogrouping.c mtf/mtf.c blocksorting/bs.c \
+       statichuff/statichuff.c vfile/vfile.c vfile/common.c
 
 #CFLAGS=-O3 -Wall -DNDEBUG
-CFLAGS=-ggdb -Wall -DDEBUG
+CFLAGS=-ggdb -Wall
+#CFLAGS=-ggdb -Wall -DDEBUG
 
 all: $(TARGETS)
 
@@ -39,19 +42,65 @@ depend:
        makedepend -- $(CFLAGS) -- $(SRCS)
 
 clean:
-       @$(RM) -f *.o $(TARGETS)
+       @$(RM) -f *.o $(COMMON) $(TARGETS)
 
 .PHONY: all clean depend
 
 # DO NOT DELETE
 
-jacu.o: statichuff/statichuff.h /usr/include/stdio.h /usr/include/features.h
+jacu.o: blocksorting/bs.h /usr/include/string.h /usr/include/features.h
 jacu.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-jacu.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-jacu.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-jacu.o: /usr/include/_G_config.h /usr/include/wchar.h
+jacu.o: /usr/include/stdlib.h /usr/include/stdio.h /usr/include/bits/types.h
+jacu.o: /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h
+jacu.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
 jacu.o: /usr/include/bits/wchar.h /usr/include/gconv.h
 jacu.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+jacu.o: mtf/mtf.h zerogrouping/zerogrouping.h statichuff/statichuff.h
 jacu.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
-jacu.o: /usr/include/bits/confname.h blocksorting/bs.h /usr/include/string.h
-jacu.o: /usr/include/stdlib.h mtf/mtf.h vfile/vfile.h
+jacu.o: /usr/include/bits/confname.h vfile/vfile.h vfile/vfile.h
+jacu.o: vfile/common.h
+zerogrouping/zerogrouping.o: zerogrouping/zerogrouping.h
+zerogrouping/zerogrouping.o: /usr/include/stdlib.h /usr/include/features.h
+zerogrouping/zerogrouping.o: /usr/include/sys/cdefs.h
+zerogrouping/zerogrouping.o: /usr/include/gnu/stubs.h
+mtf/mtf.o: mtf/mtf.h /usr/include/stdio.h /usr/include/features.h
+mtf/mtf.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
+mtf/mtf.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
+mtf/mtf.o: /usr/include/bits/typesizes.h /usr/include/libio.h
+mtf/mtf.o: /usr/include/_G_config.h /usr/include/wchar.h
+mtf/mtf.o: /usr/include/bits/wchar.h /usr/include/gconv.h
+mtf/mtf.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+mtf/mtf.o: /usr/include/stdlib.h /usr/include/string.h
+blocksorting/bs.o: blocksorting/bs.h /usr/include/string.h
+blocksorting/bs.o: /usr/include/features.h /usr/include/sys/cdefs.h
+blocksorting/bs.o: /usr/include/gnu/stubs.h /usr/include/stdlib.h
+blocksorting/bs.o: /usr/include/stdio.h /usr/include/bits/types.h
+blocksorting/bs.o: /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h
+blocksorting/bs.o: /usr/include/libio.h /usr/include/_G_config.h
+blocksorting/bs.o: /usr/include/wchar.h /usr/include/bits/wchar.h
+blocksorting/bs.o: /usr/include/gconv.h /usr/include/bits/stdio_lim.h
+blocksorting/bs.o: /usr/include/bits/sys_errlist.h
+statichuff/statichuff.o: statichuff/statichuff.h /usr/include/stdio.h
+statichuff/statichuff.o: /usr/include/features.h /usr/include/sys/cdefs.h
+statichuff/statichuff.o: /usr/include/gnu/stubs.h /usr/include/bits/types.h
+statichuff/statichuff.o: /usr/include/bits/wordsize.h
+statichuff/statichuff.o: /usr/include/bits/typesizes.h /usr/include/libio.h
+statichuff/statichuff.o: /usr/include/_G_config.h /usr/include/wchar.h
+statichuff/statichuff.o: /usr/include/bits/wchar.h /usr/include/gconv.h
+statichuff/statichuff.o: /usr/include/bits/stdio_lim.h
+statichuff/statichuff.o: /usr/include/bits/sys_errlist.h
+statichuff/statichuff.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
+statichuff/statichuff.o: /usr/include/bits/confname.h vfile/vfile.h
+statichuff/statichuff.o: /usr/include/stdlib.h /usr/include/string.h
+vfile/vfile.o: vfile/common.h vfile/vfile.h /usr/include/stdio.h
+vfile/vfile.o: /usr/include/features.h /usr/include/sys/cdefs.h
+vfile/vfile.o: /usr/include/gnu/stubs.h /usr/include/bits/types.h
+vfile/vfile.o: /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h
+vfile/vfile.o: /usr/include/libio.h /usr/include/_G_config.h
+vfile/vfile.o: /usr/include/wchar.h /usr/include/bits/wchar.h
+vfile/vfile.o: /usr/include/gconv.h /usr/include/bits/stdio_lim.h
+vfile/vfile.o: /usr/include/bits/sys_errlist.h /usr/include/malloc.h
+vfile/vfile.o: /usr/include/string.h
+vfile/common.o: vfile/common.h /usr/include/malloc.h /usr/include/string.h
+vfile/common.o: /usr/include/features.h /usr/include/sys/cdefs.h
+vfile/common.o: /usr/include/gnu/stubs.h