X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2FMakefile;h=e4f782d4c0936601c0875a926e3016e1d1e35c9f;hb=d17640d4122d028eee849d9fedf8ba35f7f0f6e0;hp=be86c3ce17e15bd8c4a221335cb2496a31e7d82a;hpb=15411d7912d8aa1b9bea6ba8862517b058861771;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index be86c3ce..e4f782d4 100644
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -96,8 +96,10 @@ OBJS := $(OVERLAYS) \
 	$(OBJDIR)/clippopup.o \
 	$(OBJDIR)/colorpicker.o \
 	$(OBJDIR)/commonrender.o \
+	$(OBJDIR)/compressortools.o \
 	$(OBJDIR)/confirmquit.o \
 	$(OBJDIR)/confirmsave.o \
+	$(OBJDIR)/convert.o \
 	$(OBJDIR)/cpanel.o \
 	$(OBJDIR)/cplayback.o \
 	$(OBJDIR)/ctimebar.o \
@@ -125,6 +127,7 @@ OBJS := $(OVERLAYS) \
 	$(OBJDIR)/edl.o \
 	$(OBJDIR)/edlsession.o \
 	$(OBJDIR)/effectlist.o \
+	$(OBJDIR)/eqcanvas.o \
 	$(OBJDIR)/exportedl.o \
 	$(OBJDIR)/fadeengine.o \
 	$(OBJDIR)/ffmpeg.o \
@@ -212,6 +215,7 @@ OBJS := $(OVERLAYS) \
 	$(OBJDIR)/menuveffects.o \
 	$(OBJDIR)/meterhistory.o \
 	$(OBJDIR)/meterpanel.o \
+	$(OBJDIR)/mixersalign.o \
 	$(OBJDIR)/module.o \
 	$(OBJDIR)/mtimebar.o \
 	$(OBJDIR)/mwindowedit.o \
@@ -594,7 +598,6 @@ clean:
 	rm -rf $(OBJDIR)
 	rm -f shuttle_keys.h
 
-
 tags:
 	ctags -R -h default --langmap=c:+.inc . ../guicast/ ../libzmpeg3 ../plugins ../thirdparty/ffmpeg-*
 
@@ -607,7 +610,7 @@ $(OBJDIR)/%.o:		%.C
 
 #lv2
 ifneq ($(WANT_LV2),no)
-GTK2_INCS := `pkg-config --cflags gtk+-2.0`
+GTK2_INCS := `pkg-config --cflags gtk+-2.0` -Wno-deprecated-declarations
 GTK2_LIBS := `pkg-config --libs gtk+-2.0`
 
 $(OBJDIR)/pluginlv2ui.o:	pluginlv2ui.C
@@ -615,10 +618,6 @@ $(OBJDIR)/lv2ui.o:	lv2ui.C
 $(OBJDIR)/pluginlv2ui.o $(OBJDIR)/lv2ui.o:
 	$(CXX) `cat $(OBJDIR)/c_flags` $(GTK2_INCS) -DMSGQUAL=$* -c $< -o $@
 
-$(OBJDIR)/shuttle.o:	shuttle.C shuttle_keys.h
-shuttle_keys.h: /usr/include/X11/keysymdef.h
-	sed < /usr/include/X11/keysymdef.h > shuttle_keys.h -f shuttle.sed
-
 $(OBJDIR)/lv2ui: $(LV2OBJS)
 	@echo $(CXX) \`cat $(OBJDIR)/c_flags\` $^ -o $@
 	@$(CXX) `cat $(OBJDIR)/c_flags` $^ -o $@ $(LIBS) $(GTK2_LIBS)
@@ -634,6 +633,12 @@ install-lv2ui:
 install:	install-lv2ui
 endif
 
+ifneq ($(WANT_SHUTTLE),no)
+$(OBJDIR)/shuttle.o:	shuttle.C shuttle_keys.h
+shuttle_keys.h: /usr/include/X11/keysymdef.h
+	sed -n < /usr/include/X11/keysymdef.h > shuttle_keys.h -f shuttle.sed
+endif
+
 $(OBJDIR)/pluginlv2gui.o:	pluginlv2gui.C
 	$(CXX) `cat $(OBJDIR)/c_flags` $(GTK2_INCS) -DMSGQUAL=$* -c $< -o $@