tags tweak, rework canvas lock/refresh, vgui/cgui segv if closed while playing

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

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index e0d94a3e33790ae4a9c8749fc9f16edeb00d464b..4652f02fb633056fe0ae18d7b2b9970d41bd51f4 100644 (file)
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -595,7 +595,6 @@ clean:
        rm -rf $(OBJDIR)
        rm -f shuttle_keys.h
 
-
 tags:
        ctags -R -h default --langmap=c:+.inc . ../guicast/ ../libzmpeg3 ../plugins ../thirdparty/ffmpeg-*
 
@@ -616,10 +615,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 -n < /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)
@@ -635,6 +630,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 $@