X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2FMakefile;h=67e14e8a751f70e442de6959ba12b4dc1b9fac5b;hp=fa22ff0ceebffb7c715469018bac51335bf761fb;hb=cb73d14fe59acbe8eba0a62f4af26a23072201fa;hpb=0a0a29dd9e484b5622b46173d51bb6cefc0a5da4

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index fa22ff0c..67e14e8a 100644
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -60,6 +60,7 @@ OBJS = \
 	$(OBJDIR)/channelpicker.o \
 	$(OBJDIR)/chantables.o \
 	$(OBJDIR)/clipedit.o \
+	$(OBJDIR)/clipedls.o \
 	$(OBJDIR)/clippopup.o \
 	$(OBJDIR)/colorpicker.o \
 	$(OBJDIR)/commercials.o \
@@ -83,6 +84,7 @@ OBJS = \
 	$(OBJDIR)/devicempeginput.o \
 	$(OBJDIR)/devicev4l2base.o \
 	$(OBJDIR)/devicev4l2input.o \
+	$(OBJDIR)/dragcheckbox.o \
 	$(OBJDIR)/drivesync.o \
 	$(OBJDIR)/dvbtune.o \
 	$(OBJDIR)/dvdcreate.o \
@@ -116,6 +118,7 @@ OBJS = \
 	$(OBJDIR)/file.o \
 	$(OBJDIR)/fileogg.o \
 	$(OBJDIR)/filepng.o \
+	$(OBJDIR)/fileppm.o \
 	$(OBJDIR)/filescene.o \
 	$(OBJDIR)/filesndfile.o \
 	$(OBJDIR)/filetga.o \
@@ -126,6 +129,7 @@ OBJS = \
 	$(OBJDIR)/floatauto.o \
 	$(OBJDIR)/floatautos.o \
 	$(OBJDIR)/folderlistmenu.o \
+	$(OBJDIR)/forkbase.o \
 	$(OBJDIR)/formatcheck.o \
 	$(OBJDIR)/formatpopup.o \
 	$(OBJDIR)/formatpresets.o \
@@ -184,6 +188,7 @@ OBJS = \
 	$(OBJDIR)/menueffects.o \
 	$(OBJDIR)/menutransitionlength.o \
 	$(OBJDIR)/menuveffects.o \
+	$(OBJDIR)/meterhistory.o \
 	$(OBJDIR)/meterpanel.o \
 	$(OBJDIR)/module.o \
 	$(OBJDIR)/mtimebar.o \
@@ -191,7 +196,6 @@ OBJS = \
 	$(OBJDIR)/mwindowgui.o \
 	$(OBJDIR)/mwindowmove.o \
 	$(OBJDIR)/mwindow.o \
-	$(OBJDIR)/nestededls.o \
 	$(OBJDIR)/newfolder.o \
 	$(OBJDIR)/new.o \
 	$(OBJDIR)/overlaydirect.o \
@@ -220,6 +224,10 @@ OBJS = \
 	$(OBJDIR)/pluginclient.o \
 	$(OBJDIR)/plugindialog.o \
 	$(OBJDIR)/pluginfclient.o \
+	$(OBJDIR)/pluginlv2.o \
+	$(OBJDIR)/pluginlv2config.o \
+	$(OBJDIR)/pluginlv2client.o \
+	$(OBJDIR)/pluginlv2gui.o \
 	$(OBJDIR)/plugin.o \
 	$(OBJDIR)/pluginpopup.o \
 	$(OBJDIR)/pluginserver.o \
@@ -232,6 +240,7 @@ OBJS = \
 	$(OBJDIR)/presets.o \
 	$(OBJDIR)/probeprefs.o \
 	$(OBJDIR)/proxy.o \
+	$(OBJDIR)/proxypopup.o \
 	$(OBJDIR)/question.o \
 	$(OBJDIR)/quit.o \
 	$(OBJDIR)/recconfirmdelete.o \
@@ -333,6 +342,8 @@ OBJS = \
 	$(OBJDIR)/wwindow.o \
 	$(OBJDIR)/zoombar.o \
 	$(OBJDIR)/zoompanel.o \
+	$(OBJDIR)/zwindow.o \
+	$(OBJDIR)/zwindowgui.o \
 
 #	$(OBJDIR)/renderfarmfsclient.o \
 #	$(OBJDIR)/renderfarmfsserver.o \
@@ -349,7 +360,6 @@ LIBRARIES := \
 	$(LIBZMPEG3)/$(OBJDIR)/libzmpeg3.a \
 	$(MPEG2ENC)/$(OBJDIR)/hveg2enc.a \
 	$(TDB)/$(OBJDIR)/db.a \
-	$(THEME_DATA) \
 
 LIBS := $(LIBRARIES)
 LIBS += $(libraries)
@@ -366,6 +376,16 @@ CUTLIBS = \
 BDWRITE = $(OBJDIR)/bdwrite
 BDWOBJS = $(OBJDIR)/bdwrite.o
 
+ifneq ($(WANT_LV2),no)
+LV2UI = $(OBJDIR)/lv2ui
+LV2OBJS = \
+	$(OBJDIR)/lv2ui.o \
+	$(OBJDIR)/pluginlv2.o \
+	$(OBJDIR)/pluginlv2ui.o \
+	$(OBJDIR)/pluginlv2config.o \
+	$(OBJDIR)/forkbase.o
+endif
+
 CFLAGS := \
 	-I$(GUICAST) \
 	-I$(LIBZMPEG3) \
@@ -404,14 +424,14 @@ endif
 
 $(shell mkdir -p $(OBJDIR))
 $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
-$(shell echo $(LDFLAGS1) $(OBJS) $(DCRAW) $(LIBS) $(LDFLAGS2) > $(OBJDIR)/objs)
+$(shell echo $(LDFLAGS1) $(OBJS) $(THEME_DATA) $(DCRAW) $(LIBS) $(LDFLAGS2) > $(OBJDIR)/objs)
 
-all:	$(OUTPUT) $(CUTADS) $(BDWRITE)
+all:	$(OUTPUT) $(CUTADS) $(BDWRITE) $(LV2UI)
 
 # Static linking is not possible because the plugins depend on symbols
 # in the main executable.
 # Also VFS only overrides the C library when dynamic linking is used.
-$(OUTPUT): $(OBJS) $(DCRAW) $(FILEEXR) $(FILEFLAC) $(LIBRARIES)
+$(OUTPUT): $(OBJS) $(THEME_DATA) $(DCRAW) $(LIBRARIES)
 	$(LINKER) `cat $(OBJDIR)/objs`
 	$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(OUTPUT) $(OUTPUT_G))
 	$(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
@@ -423,22 +443,27 @@ $(CUTADS):	$(CUTOBJS) $(CUTLIBS) $(LIBRARIES)
 	$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(CUTADS) $(CUTADS).debuginfo)
 	$(if $(findstring -ggdb,$(CFLAGS)),,strip $(CUTADS))
 
+install-cutads:
+	cp -av $(OBJDIR)/cutads $(BINDIR)/.
+install:	install-cutads
+
 $(BDWRITE):	$(BDWOBJS) $(LIBRARIES)
 	@echo g++ -o $@ $(BDWOBJS)
 	@g++ $(CFLAGS) -pthread -o $@ $(BDWOBJS) $(LIBS)
 	$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(BDWRITE) $(BDWRITE).debuginfo)
 	$(if $(findstring -ggdb,$(CFLAGS)),,strip $(BDWRITE))
 
+install-bdwrite:
+	cp -av $(OBJDIR)/bdwrite $(BINDIR)/.
+install:	install-bdwrite
+
 ydiff:	ydiff.C $(LIBRARIES)
 	@echo g++ -o $@ ydiff.C
-	@g++ `pkg-config --cflags --libs gtk+-2.0` $(CFLAGS) ydiff.C -o $@ $(LIBS)
+	@g++ $(CFLAGS) ydiff.C -o $@ $(LIBS)
 
 clean:
 	rm -rf $(OBJDIR)
 
-install:
-	cp -a $(OBJDIR)/cutads $(BINDIR)/.
-	cp -a $(OBJDIR)/bdwrite $(BINDIR)/.
 
 tags:
 	ctags -R -h default --langmap=c:+.inc . ../guicast/ ../libzmpeg3 ../plugins ../thirdparty/ffmpeg-*
@@ -447,9 +472,42 @@ tags:
 $(OBJDIR)/%.o:		%.C
 	$(CXX) `cat $(OBJDIR)/c_flags` -DMSGQUAL=$* -c $< -o $@
 
+
+$(OBJDIR)/fileexr.o:	fileexr.C
+	$(CXX) `cat $(OBJDIR)/c_flags` -Wno-deprecated -DMSGQUAL=$* -c $< -o $@
+
 $(OBJDIR)/sha1.o:	sha1.C sha1.h
 	$(CXX) `cat $(OBJDIR)/c_flags` -O3 -c $< -o $@
 
+#lv2
+ifneq ($(WANT_LV2),no)
+GTK2_INCS := `pkg-config --cflags gtk+-2.0`
+GTK2_LIBS := `pkg-config --libs gtk+-2.0`
+
+$(OBJDIR)/pluginlv2ui.o:	pluginlv2ui.C
+$(OBJDIR)/lv2ui.o:	lv2ui.C
+$(OBJDIR)/pluginlv2ui.o $(OBJDIR)/lv2ui.o:
+	$(CXX) `cat $(OBJDIR)/c_flags` $(GTK2_INCS) -DMSGQUAL=$* -c $< -o $@
+
+$(OBJDIR)/lv2ui: $(LV2OBJS)
+	@echo $(CXX) \`cat $(OBJDIR)/c_flags\` $^ -o $@
+	@$(CXX) `cat $(OBJDIR)/c_flags` $^ -o $@ $(LIBS) $(GTK2_LIBS)
+	$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(LV2UI) $(LV2UI).debuginfo)
+	$(if $(findstring -ggdb,$(CFLAGS)),,strip $(LV2UI))
+
+.PHONY:	lv2ui
+lv2ui:	$(LV2UI)
+
+install-lv2ui:
+	cp -av $(LV2UI) $(BINDIR)/.
+
+install:	install-lv2ui
+endif
+
+$(OBJDIR)/pluginlv2gui.o:	pluginlv2gui.C
+	$(CXX) `cat $(OBJDIR)/c_flags` $(GTK2_INCS) -DMSGQUAL=$* -c $< -o $@
+
+#dcraw
 $(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