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

diff --git a/cinelerra-5.1/libzmpeg3/Makefile b/cinelerra-5.1/libzmpeg3/Makefile
index 3d0d481c..b256c736 100644
--- a/cinelerra-5.1/libzmpeg3/Makefile
+++ b/cinelerra-5.1/libzmpeg3/Makefile
@@ -1,15 +1,15 @@
-TOPDIR ?= $(CURDIR)/..
-export TOPDIR
+export TOPDIR ?= $(CURDIR)/..
 include $(TOPDIR)/global_config
 
+ifneq ($(WANT_LIBZMPEG),no)
+
 CC = gcc
 NASM = nasm
 USE_MMX ?= 0
-USE_CSS ?= 1
 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
@@ -21,7 +21,6 @@ ifeq ($(USE_MMX), 1)
 endif
 
 CFLAGS += -I.  $(inc_a52dec)
-CFLAGS += -Wall
 
 OBJS = \
 	$(OBJDIR)/audio/ac3.o \
@@ -64,22 +63,23 @@ OBJS = \
 	$(OBJDIR)/toc.o \
 	$(OBJDIR)/mpeg3.o \
 
+$(shell mkdir -p $(OBJDIR) )
+
 DIRS := \
 	$(OBJDIR)/audio \
 	$(OBJDIR)/video
+$(shell mkdir -p $(DIRS) )
 
 OUTPUT = $(OBJDIR)/libzmpeg3.a
-UTILS += $(OBJDIR)/mpeg3toc
-UTILS += $(OBJDIR)/mpeg3show
-UTILS += $(OBJDIR)/mpeg3cat
-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)
+LIBS += $(lib_a52dec) $(lib_djbfft)
 
 ifeq ($(DYNAMIC_FONTS), 1)
 LIBS += -lX11
@@ -88,11 +88,8 @@ CFLAGS += -DBUILTIN_FONT_DATA
 OBJS += $(OBJDIR)/xfont1.o
 endif
 
-$(shell mkdir -p $(OBJDIR) )
-
 $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
 $(shell echo $(OBJS) $(ASMOBJS) $(NASMOBJS) > $(OBJDIR)/objs)
-$(shell mkdir -p $(DIRS) )
 
 all: $(OUTPUT) $(UTILS)
 
@@ -109,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 .
@@ -132,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