dcraw/filecr2 rework, cpozer zoom slider resize fix, rename mpeg3 utils as zmpeg3

[goodguy/history.git] / cinelerra-5.1 / cinelerra / Makefile

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index 19907a9b59ce2ca244595e7f0a72bf285b12747e..bfb273547485431f1be8efb0910ac8f505aae133 100644 (file)
--- 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)
 
@@ -430,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
@@ -440,7 +446,8 @@ $(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` $(if $(findstring -ggdb,$(CFLAGS)),,-O4) -c -o $*.o \
+               -Wno-misleading-indentation -Wno-sign-compare -Wno-narrowing dcraw.c
 
 $(THEME_DATA):
        cd $(OBJDIR) && \