X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Flibzmpeg3%2FMakefile;h=022f1f42e40b6a15c73ef256c46373f2a2fa98d8;hb=3e86a949f432853fbfa17f6d5d02602447592e87;hp=9304a5bae1a28e56dc4be4bb7f71483ed1619495;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/libzmpeg3/Makefile b/cinelerra-5.1/libzmpeg3/Makefile
index 9304a5ba..022f1f42 100644
--- a/cinelerra-5.1/libzmpeg3/Makefile
+++ b/cinelerra-5.1/libzmpeg3/Makefile
@@ -1,57 +1,24 @@
+export TOPDIR ?= $(CURDIR)/..
+include $(TOPDIR)/global_config
+
 CC = gcc
 NASM = nasm
-USE_MMX = 0
-USE_CSS = 1
-A52DIR := $(shell expr a52dec* )
-DYNAMIC_FONTS = 1
-
-
-ifeq ("$(DST)", "")
-DST=/usr/bin
-endif
-
-ifeq ($(origin CFLAGS), environment)
-HAVE_CFLAGS := y
-else
-HAVE_CFLAGS := n
-endif
-
-OBJDIR := $(shell uname --machine)
-USE_MMX = 0
+USE_MMX ?= 0
+DYNAMIC_FONTS ?= 1
 
 ifeq ($(OBJDIR), alpha)
-  ifneq ($(HAVE_CFLAGS), y)
+  ifneq ($(origin CFLAGS), environment)
     CFLAGS := -O4 -arch ev67 -ieee -accept c99_keywords -gcc_messages
   endif
 endif
 
-ifneq ($(HAVE_CFLAGS), y)
-  #CFLAGS := -O2 -fomit-frame-pointer -I/usr/local/include
-  CFLAGS := -O3 -ggdb -fno-omit-frame-pointer -I/usr/local/include \
-	-falign-loops=2 -falign-jumps=2 -falign-functions=2
-endif
-
-ifeq ($(OBJDIR), i686)
-  #USE_MMX = 1
-  CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-endif
-
-ifeq ($(OBJDIR), x86_64)
-  CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-endif
-
-ifeq ($(USE_CSS), 1)
-  CFLAGS += -DHAVE_CSS
-endif
-
 ifeq ($(USE_MMX), 1)
   CFLAGS += -DHAVE_MMX
   ASMOBJS = $(OBJDIR)/video/mmxidct.o
   NASMOBJS = $(OBJDIR)/video/reconmmx.o
 endif
 
-CFLAGS += -I.  -I$(A52DIR)/include -I$(A52DIR)/liba52
-CFLAGS += -Wall
+CFLAGS += -I.  $(inc_a52dec)
 
 OBJS = \
 	$(OBJDIR)/audio/ac3.o \
@@ -94,41 +61,24 @@ OBJS = \
 	$(OBJDIR)/toc.o \
 	$(OBJDIR)/mpeg3.o \
 
-#OBJS = \
-#	$(OBJDIR)/audio/ac3.o \
-#	$(OBJDIR)/audio/bit_allocation.o \
-#	$(OBJDIR)/audio/exponents.o \
-#	$(OBJDIR)/audio/header.o \
-#	$(OBJDIR)/audio/huffman.o \
-#	$(OBJDIR)/audio/layer2.o \
-#	$(OBJDIR)/audio/layer3.o \
-#	$(OBJDIR)/audio/mantissa.o \
-#	$(OBJDIR)/audio/pcm.o \
-#	$(OBJDIR)/audio/tables.o \
+$(shell mkdir -p $(OBJDIR) )
 
 DIRS := \
 	$(OBJDIR)/audio \
 	$(OBJDIR)/video
-
-include Makefile.a52
-
-DIRS += $(A52DIRS)
-
+$(shell mkdir -p $(DIRS) )
 
 OUTPUT = $(OBJDIR)/libzmpeg3.a
-UTILS := $(OBJDIR)/mpeg3dump
-UTILS += $(OBJDIR)/mpeg3peek
-UTILS += $(OBJDIR)/mpeg3toc
-UTILS += $(OBJDIR)/mpeg3show
-UTILS += $(OBJDIR)/mpeg3cat
-UTILS += $(OBJDIR)/mpeg31trkpony
-UTILS += $(OBJDIR)/mpeg3ifochk
-UTILS += $(OBJDIR)/mpeg3cc2txt
-
-#$(OBJDIR)/mpeg3split
+UTILS += $(OBJDIR)/zmpeg3toc
+UTILS += $(OBJDIR)/zmpeg3show
+UTILS += $(OBJDIR)/zmpeg3cat
+UTILS += $(OBJDIR)/zmpeg3ifochk
+UTILS += $(OBJDIR)/zmpeg3cc2txt
 
 LIBS = -lm -lpthread
 
+LIBS += $(lib_a52dec) $(lib_djbfft)
+
 ifeq ($(DYNAMIC_FONTS), 1)
 LIBS += -lX11
 else
@@ -136,16 +86,10 @@ CFLAGS += -DBUILTIN_FONT_DATA
 OBJS += $(OBJDIR)/xfont1.o
 endif
 
-$(shell mkdir -p $(OBJDIR) )
-
 $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
-$(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags)
-$(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs)
-$(shell mkdir -p $(DIRS) )
+$(shell echo $(OBJS) $(ASMOBJS) $(NASMOBJS) > $(OBJDIR)/objs)
 
-TAGS = tags
-all: $(OUTPUT) $(UTILS) $(TAGS)
-#all: $(OUTPUT) $(TAGS) b.out
+all: $(OUTPUT) $(UTILS)
 
 xfont1.C:	xfont.C
 	$(CXX) `cat $(OBJDIR)/c_flags` -DWRITE_FONT_DATA -o $(OBJDIR)/xfont xfont.C \
@@ -154,37 +98,23 @@ xfont1.C:	xfont.C
 
 b.out:	y.C $(OUTPUT)
 	$(CXX) `pkg-config --cflags --libs gtk+-2.0` y.C ./$(OBJDIR)/libzmpeg3.a \
-		 -lpthread -lasound -lm -O0 -g -o b.out
+		$(CFLAGS) -O0 -g -o b.out -lasound $(LIBS)
 
-$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS)
+$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS)
 	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
 
 
-mpeg3% $(OBJDIR)/mpeg3%: $(OUTPUT) mpeg3%.C
-	$(CXX) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/$(notdir $@) $(notdir $@).C $(OUTPUT) $(LIBS)
-
-
-#$(OBJDIR)/mpeg2qt: $(OUTPUT)
-#	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg2qt mpeg2qt.c \
-#		$(OUTPUT) $(LIBS) -I.  -I../quicktime \
-#		../quicktime/$(OBJDIR)/libquicktime.a \
-#		-lpng -lz -ldl
+zmpeg3% $(OBJDIR)/zmpeg3%: $(OUTPUT) mpeg3%.C
+	$(CXX) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/$(notdir $@) mpeg3$*.C $(OUTPUT) $(LIBS)
 
-$(TAGS):
+tags:
 	ctags -R .
 
 install: 
-	cp $(UTILS) $(DST)
+	cp $(UTILS) $(BINDIR)/.
 
 clean:
-	rm -rf $(OBJDIR) $(TAGS)
-
-backup: clean
-	cd .. && \
-	tar -zcf libzmpeg3.tar.gz libmpeg3
-
-wc:
-	cat *.c *.h audio/*.c audio/*.h video/*.c video/*.h | wc
+	rm -rf $(OBJDIR) tags
 
 $(OBJS): 
 	$(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.C) -o $*.o
@@ -192,60 +122,8 @@ $(ASMOBJS):
 	$(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.S) -o $*.o
 $(NASMOBJS): 
 	$(NASM) -f elf $(subst $(OBJDIR)/,, $*.s) -o $*.o
-$(A52OBJS):
-	$(CC) -c `cat $(OBJDIR)/a52_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
-
-$(OBJDIR)/libzmpeg3.o: 				    libzmpeg3.C
-$(OBJDIR)/atrack.o: 				    atrack.C
-$(OBJDIR)/bits.o:  				    bits.C
-$(OBJDIR)/css.o: 				    css.C
-$(OBJDIR)/demux.o: 				    demux.C
-$(OBJDIR)/ifo.o: 				    ifo.C
-$(OBJDIR)/zio.o: 				    zio.C
-$(OBJDIR)/dvb.o: 				    dvb.C
-$(OBJDIR)/huf.o: 				    huf.C
-$(OBJDIR)/xfont.o: 				    xfont.C
-$(OBJDIR)/xfont1.o: 				    xfont1.C
-$(OBJDIR)/strack.o:				    strack.C
-$(OBJDIR)/title.o:				    title.C
-$(OBJDIR)/mpeg3toc.o: 				    mpeg3toc.C
-$(OBJDIR)/mpeg3show.o: 				    mpeg3show.C
-$(OBJDIR)/mpeg3dump.o: 				    mpeg3dump.C
-$(OBJDIR)/mpeg3cat.o: 				    mpeg3cat.C
-$(OBJDIR)/mpeg31trkpony.o: 			    mpeg31trkpony.C
-$(OBJDIR)/mpeg3peek.o: 				    mpeg3peek.C
-$(OBJDIR)/toc.o:				    toc.C
-$(OBJDIR)/mpeg3.o:				    mpeg3.C
-$(OBJDIR)/vtrack.o:				    vtrack.C
-$(OBJDIR)/audio/ac3.o:  			    audio/ac3.C
-$(OBJDIR)/audio/bit_allocation.o: 		    audio/bit_allocation.C
-$(OBJDIR)/audio/dct.o:  			    audio/dct.C
-#$(OBJDIR)/audio/exponents.o: 			    audio/exponents.c
-#$(OBJDIR)/audio/header.o: 			    audio/header.c
-$(OBJDIR)/audio/huffman.o: 			    audio/huffman.C
-$(OBJDIR)/audio/layer2.o: 			    audio/layer2.C
-$(OBJDIR)/audio/layer3.o: 			    audio/layer3.C
-#$(OBJDIR)/audio/mantissa.o: 			    audio/mantissa.c
-$(OBJDIR)/audio/audio.o: 			    audio/audio.C
-$(OBJDIR)/audio/pcm.o:  			    audio/pcm.C
-$(OBJDIR)/audio/synthesizers.o: 		    audio/synthesizers.C
-$(OBJDIR)/audio/tables.o: 			    audio/tables.C
-$(OBJDIR)/video/getpicture.o: 			    video/getpicture.C
-$(OBJDIR)/video/headers.o: 			    video/headers.C
-$(OBJDIR)/video/idct.o: 			    video/idct.C
-$(OBJDIR)/video/macroblocks.o:  		    video/macroblocks.C
-$(OBJDIR)/video/mmxtest.o: 			    video/mmxtest.C
-$(OBJDIR)/video/motion.o: 			    video/motion.C
-$(OBJDIR)/video/cache.o: 			    video/cache.C
-$(OBJDIR)/video/video.o: 			    video/video.C
-$(OBJDIR)/video/output.o: 			    video/output.C
-$(OBJDIR)/video/reconstruct.o:  		    video/reconstruct.C
-$(OBJDIR)/video/seek.o: 			    video/seek.C
-$(OBJDIR)/video/slice.o: 			    video/slice.C
-$(OBJDIR)/video/subtitle.o:                         video/subtitle.C
-$(OBJDIR)/video/cc.o:                               video/cc.C
-$(OBJDIR)/video/vlc.o:  			    video/vlc.C
-#$(OBJDIR)/workarounds.o:  			    workarounds.c
-
-include depend.a52
+
+$(OBJDIR)/%.o:		%.C
+$(OBJDIR)/audio/%.o:	audio/%.C
+$(OBJDIR)/video/%.o:	video/%.C