X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fmpeg2enc%2FMakefile;h=37ac9a23ecedf68b93d18aab93b6ccd29fe3c543;hb=7b05ad287956f8bd00836d9b5fb39f899a5fb641;hp=f11824396dc020f6bf98a05846f65ad0e4ee9e89;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/mpeg2enc/Makefile b/cinelerra-5.1/mpeg2enc/Makefile
index f1182439..37ac9a23 100644
--- a/cinelerra-5.1/mpeg2enc/Makefile
+++ b/cinelerra-5.1/mpeg2enc/Makefile
@@ -1,8 +1,8 @@
-include ../global_config
-include $(THIRDPARTY)/config.mak
+export TOPDIR ?= $(CURDIR)/..
+include $(TOPDIR)/global_config
 
 CC = gcc
-CFLAGS += -I../libzmpeg3
+CFLAGS += -I$(TOPDIR)/libzmpeg3
 
 ifeq ($(OBJDIR), i686)
 CFLAGS += -DX86_CPU
@@ -51,27 +51,14 @@ OBJ = \
 	$(OBJDIR)/stats.o \
 	$(OBJDIR)/writepic.o
 
-LIBS = \
-	../libzmpeg3/$(OBJDIR)/libzmpeg3.a \
-	$(thirdparty_libraries) $(static_libraries) \
-	-lasound \
-	-lpthread \
-	-lpng \
-	-ljpeg \
-	-lX11 \
-	-lz \
-	-llzma \
-	-lbz2 \
-	-lm \
-	-ldl \
-
-LIBS += -Wl,--start-group $(thirdparty_libraries) -Wl,--end-group 
-LIBS += $(EXTRA_LIBS)
+LIBS := $(LIBZMPEG3)/$(OBJDIR)/libzmpeg3.a
+LIBS += $(libraries)
 
 HVEG2LIB = $(OBJDIR)/hveg2enc.a
 HVEG2ENC = $(OBJDIR)/hveg2enc
 HVEG2ENC_G = $(OBJDIR)/hveg2enc_g
 
+$(shell mkdir -p $(OBJDIR))
 $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
 $(shell echo $(HVEG2LIB)  $(OBJ) $(NASMOBJ) $(ASMOBJ) > $(OBJDIR)/objs)
 
@@ -91,7 +78,7 @@ clean:
 	rm -rf $(OBJDIR)
 
 install:	$(OUTPUT)
-	cp -a $(HVEG2LIB) ../bin/.
+	cp -a $(HVEG2ENC) $(BINDIR)/.
 
 $(HVEG2LIB): $(OBJ) $(NASMOBJ) $(ASMOBJ)
 	ar rcs `cat $(OBJDIR)/objs`