[xiph-cvs] cvs commit: w3d .cvsignore Makefile

[Holger Waechtler]

holger      01/08/07 07:37:41

  Modified:    .        Makefile
  Added:       .        .cvsignore
  Log:
  ignore executables

Revision  Changes    Path
1.13      +16 -26    w3d/Makefile

Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/w3d/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile	2001/07/31 08:07:00	1.12
+++ Makefile	2001/08/07 14:37:41	1.13
@@ -1,46 +1,36 @@
 CC = gcc
 RM = rm -rf
 
-CFLAGS = -g -O0 -Wall -DTYPE=int16_t -DRLECODER -DDBG_XFORM -DDBG_MEMLEAKS
-LFLAGS = -g #-lefence
+CFLAGS = -g -O0 -Wall -I.. -DTYPE=uint16_t
+LFLAGS = -g
 
-OBJS = mem.o pnm.o wavelet.o wavelet_xform.o wavelet_coeff.o wavelet_coeff2.o \
-	yuv.o tarkin.o tarkin-io.o
+TARGETS = ppmdiff yuv2ppm deinterlace
 
-TEST_TARGETS = _test_bitcoder _test_rle _test_huffman
-
+OBJS = $(TARGETS:=.o) ../pnm.o
 SRCS = $(OBJS:.o=.c)
-TEST_OBJS = $(TEST_TARGETS:=.o)
-TEST_SRCS = $(TEST_OBJS:.o=.c)
 
+
+all: $(OBJS) $(TARGETS)
 
-all: tarkin_enc tarkin_dec
+ppmdiff: ppmdiff.o ../pnm.o
+	$(CC) $(LFLAGS) ppmdiff.o ../pnm.o -o $@
 
-tarkin_enc: $(OBJS) tarkin_enc.o
-	$(CC) $(LFLAGS) $(OBJS) tarkin_enc.o -o $@
+yuv2ppm: yuv2ppm.o ../pnm.o
+	$(CC) $(LFLAGS) yuv2ppm.o ../pnm.o -o $@
 
-tarkin_dec: $(OBJS) tarkin_dec.o
-	$(CC) $(LFLAGS) $(OBJS) tarkin_dec.o -o $@
+deinterlace: deinterlace.o ../pnm.o
+	$(CC) $(LFLAGS) deinterlace.o ../pnm.o -o $@
 
 .c.o: .depend
-	$(CC) $(CFLAGS) -c $<
+	$(CC) $(CFLAGS) -c $< -o $@
 
 clean:
-	$(RM) $(OBJS) $(TARGET) gmon.out core .depend .depend.bak rle.histogram
-	$(RM) *.ppm *.pgm
-	$(RM) $(TEST_TARGETS) $(TEST_OBJS)
-	$(RM) tarkin_enc tarkin_dec tarkin_enc.o tarkin_dec.o
-
-
-test: .depend $(TEST_TARGETS)
-	./_test_bitcoder
-	./_test_huffman
-	./_test_rle
+	$(RM) $(OBJS) $(TARGETS) gmon.out core .depend .depend.bak
 
 
-.depend: $(SRCS) $(TEST_SRCS)
+.depend: $(SRCS)
         $(RM) .depend
         touch .depend
-	sh tools/makedepend.sh -f.depend -- $(CFLAGS) -- $(SRCS) $(TEST_SRCS) tarkin_enc.c tarkin_dec.c
+	sh ../tools/makedepend.sh -f.depend -- $(CFLAGS) -- $(SRCS)
 
 -include .depend

1.1                  w3d/.cvsignore

Index: .cvsignore
===================================================================
.depend
_test_bitcoder
_test_huffman
_test_rle
rle.histogram
tarkin_dec
tarkin_enc

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.