X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Flibzmpeg3%2FMakefile;h=b256c73686cad8864236fcab6c5cdab6739a20f3;hb=9058f65f71aafbeab023657be0f6b84b629b70c4;hp=cc22de83b2362e1fc7dfd246b32c48045ccd60c1;hpb=089f2be86316b88f72a6c359ab10e2b95539005b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/libzmpeg3/Makefile b/cinelerra-5.1/libzmpeg3/Makefile
index cc22de83..b256c736 100644
--- a/cinelerra-5.1/libzmpeg3/Makefile
+++ b/cinelerra-5.1/libzmpeg3/Makefile
@@ -1,7 +1,8 @@
-TOPDIR ?= $(CURDIR)/..
-export TOPDIR
+export TOPDIR ?= $(CURDIR)/..
 include $(TOPDIR)/global_config
 
+ifneq ($(WANT_LIBZMPEG),no)
+
 CC = gcc
 NASM = nasm
 USE_MMX ?= 0
@@ -70,15 +71,15 @@ DIRS := \
 $(shell mkdir -p $(DIRS) )
 
 OUTPUT = $(OBJDIR)/libzmpeg3.a
-UTILS += $(OBJDIR)/mpeg3toc
-UTILS += $(OBJDIR)/mpeg3show
-UTILS += $(OBJDIR)/mpeg3cat
-UTILS += $(OBJDIR)/mpeg3ifochk
-UTILS += $(OBJDIR)/mpeg3cc2txt
+UTILS += $(OBJDIR)/zmpeg3toc
+UTILS += $(OBJDIR)/zmpeg3show
+UTILS += $(OBJDIR)/zmpeg3cat
+UTILS += $(OBJDIR)/zmpeg3ifochk
+UTILS += $(OBJDIR)/zmpeg3cc2txt
 
 LIBS = -lm -lpthread
 
-LIBS += $(lib_a52dec)
+LIBS += $(lib_a52dec) $(lib_djbfft)
 
 ifeq ($(DYNAMIC_FONTS), 1)
 LIBS += -lX11
@@ -105,8 +106,8 @@ $(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)
+zmpeg3% $(OBJDIR)/zmpeg3%: $(OUTPUT) mpeg3%.C
+	$(CXX) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/$(notdir $@) mpeg3$*.C $(OUTPUT) $(LIBS)
 
 tags:
 	ctags -R .
@@ -128,3 +129,11 @@ $(OBJDIR)/%.o:		%.C
 $(OBJDIR)/audio/%.o:	audio/%.C
 $(OBJDIR)/video/%.o:	video/%.C
 
+else
+#not WANT_LIBZMPEG
+all:
+rebuild:
+utils:
+clean:
+install:
+endif