X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2FMakefile;h=93fd8b61ec392d06693c604dce3e720e8ef26347;hb=24db15d85f2e4c986ff91f992e815747c55948f3;hp=c4706b3d707c5308e484e30a4d274397d7100e9a;hpb=96de7cbf98b4fc79dccfb6d09313e2c7c7e2384e;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index c4706b3d..93fd8b61 100644
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -226,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 \
@@ -360,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)
@@ -422,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)
 
@@ -440,7 +446,7 @@ $(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
+	$(GCC) `cat $(OBJDIR)/c_flags` -O4 -Wno-misleading-indentation dcraw.c -c -o $*.o
 
 $(THEME_DATA):
 	cd $(OBJDIR) && \