X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2FMakefile;h=512fe83775473111caecc0c7450b4e9546b667f5;hb=d077044be445c058142c2b92b981c53898a2c112;hp=c5c9ee7efd18d298e7a8a5cb59b62ff5d66aef88;hpb=0b78779e9e75131eee81d2e4689b98df0e91c092;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index c5c9ee7e..512fe837 100644
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -191,7 +191,10 @@ OBJS = \
 	$(OBJDIR)/nestededls.o \
 	$(OBJDIR)/newfolder.o \
 	$(OBJDIR)/new.o \
+	$(OBJDIR)/overlaydirect.o \
 	$(OBJDIR)/overlayframe.o \
+	$(OBJDIR)/overlaynearest.o \
+	$(OBJDIR)/overlaysample.o \
 	$(OBJDIR)/packagedispatcher.o \
 	$(OBJDIR)/packagerenderer.o \
 	$(OBJDIR)/packagingengine.o \
@@ -223,6 +226,7 @@ OBJS = \
 	$(OBJDIR)/pluginvclient.o \
 	$(OBJDIR)/preferences.o \
 	$(OBJDIR)/preferencesthread.o \
+	$(OBJDIR)/probeprefs.o \
 	$(OBJDIR)/question.o \
 	$(OBJDIR)/quit.o \
 	$(OBJDIR)/recconfirmdelete.o \
@@ -291,14 +295,12 @@ OBJS = \
 	$(OBJDIR)/vautomation.o \
 	$(OBJDIR)/vdevice1394.o \
 	$(OBJDIR)/vdevicebase.o \
-	$(OBJDIR)/vdevicebuz.o \
 	$(OBJDIR)/vdevicedvb.o \
 	$(OBJDIR)/vdevicempeg.o \
 	$(OBJDIR)/vdeviceprefs.o \
 	$(OBJDIR)/vdevicev4l2jpeg.o \
 	$(OBJDIR)/vdevicev4l2mpeg.o \
 	$(OBJDIR)/vdevicev4l2.o \
-	$(OBJDIR)/vdevicev4l.o \
 	$(OBJDIR)/vdevicex11.o \
 	$(OBJDIR)/vedit.o \
 	$(OBJDIR)/vedits.o \
@@ -359,10 +361,11 @@ CUTLIBS = \
 BDWRITE = $(OBJDIR)/bdwrite
 BDWOBJS = $(OBJDIR)/bdwrite.o
 
-CFLAGS += \
+CFLAGS := \
 	-I$(GUICAST) \
 	-I$(LIBZMPEG3) \
 	$(static_incs) \
+	$(CFLAGS)
 
 # Speed up linking with this linking sequence
 ifeq ($(OBJDIR), alpha)
@@ -409,7 +412,7 @@ $(OUTPUT): $(OBJS) $(DCRAW) $(FILEEXR) $(FILEFLAC) $(LIBRARIES)
 	$(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
 	ln -f -s ../bin/$(WANT_CIN) ci
 
-$(CUTADS):	$(CUTOBJS) $(CUTLIBS)
+$(CUTADS):	$(CUTOBJS) $(CUTLIBS) $(LIBRARIES)
 	@echo g++ -o $@ $(CUTOBJS)
 	@g++ $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS) $(LIBS)
 	$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(CUTADS) $(CUTADS).debuginfo)
@@ -421,6 +424,10 @@ $(BDWRITE):	$(BDWOBJS) $(LIBRARIES)
 	$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(BDWRITE) $(BDWRITE).debuginfo)
 	$(if $(findstring -ggdb,$(CFLAGS)),,strip $(BDWRITE))
 
+ydiff:	ydiff.C $(LIBRARIES)
+	@echo g++ -o $@ ydiff.C
+	@g++ `pkg-config --cflags --libs gtk+-2.0` $(CFLAGS) ydiff.C -o $@ $(LIBS)
+
 clean:
 	rm -rf $(OBJDIR)
 
@@ -429,7 +436,7 @@ install:
 	cp -a $(OBJDIR)/bdwrite $(BINDIR)/.
 
 tags:
-	ctags -R -h default --langmap=c:+.inc . ../guicast/ ../libzmpeg3 ../plugins
+	ctags -R -h default --langmap=c:+.inc . ../guicast/ ../libzmpeg3 ../plugins ../thirdparty/ffmpeg-*
 
 
 $(OBJDIR)/%.o:		%.C
@@ -438,8 +445,9 @@ $(OBJDIR)/%.o:		%.C
 $(OBJDIR)/sha1.o:	sha1.C sha1.h
 	$(CXX) `cat $(OBJDIR)/c_flags` -O3 -c $< -o $@
 
-$(DCRAW): dcraw.c
-	$(GCC) `cat $(OBJDIR)/c_flags` -Wno-misleading-indentation dcraw.c -c -o $*.o
+$(DCRAW): dcraw.C
+	$(CXX) `cat $(OBJDIR)/c_flags` $(if $(findstring -ggdb,$(CFLAGS)),,-O4) -DNODEPS -DLOCALTIME \
+		-Wno-misleading-indentation -Wno-sign-compare -Wno-narrowing dcraw.C -c -o $*.o
 
 $(THEME_DATA):
 	cd $(OBJDIR) && \