X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2FMakefile;h=2d26cedc66fb1f1d660a575599626570b67ad8ec;hb=52fcc46226f9df46f9ce9d0566dc568455a7db0b;hp=065346f526efa10ca1e111990a7f50c511626f3c;hpb=f9d0d999e813ae19965e07ae2f7da690b4e6fe45;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/cinelerra/Makefile b/cinelerra-5.0/cinelerra/Makefile
index 065346f5..2d26cedc 100644
--- a/cinelerra-5.0/cinelerra/Makefile
+++ b/cinelerra-5.0/cinelerra/Makefile
@@ -96,7 +96,6 @@ OBJS = \
 	$(OBJDIR)/filedv.o \
 	$(OBJDIR)/fileexr.o \
 	$(OBJDIR)/fileflac.o \
-	$(OBJDIR)/filefork.o \
 	$(OBJDIR)/fileformat.o \
 	$(OBJDIR)/filegif.o \
 	$(OBJDIR)/filelist.o \
@@ -105,7 +104,6 @@ OBJS = \
 	$(OBJDIR)/fileogg.o \
 	$(OBJDIR)/filepng.o \
 	$(OBJDIR)/filescene.o \
-	$(OBJDIR)/fileserver.o \
 	$(OBJDIR)/filesndfile.o \
 	$(OBJDIR)/filetga.o \
 	$(OBJDIR)/filethread.o \
@@ -114,7 +112,6 @@ OBJS = \
 	$(OBJDIR)/filexml.o \
 	$(OBJDIR)/floatauto.o \
 	$(OBJDIR)/floatautos.o \
-	$(OBJDIR)/forkwrapper.o \
 	$(OBJDIR)/formatcheck.o \
 	$(OBJDIR)/formatpresets.o \
 	$(OBJDIR)/formatpopup.o \
@@ -251,7 +248,6 @@ OBJS = \
 	$(OBJDIR)/theme.o \
 	$(OBJDIR)/threadexec.o \
 	$(OBJDIR)/threadloader.o \
-	$(OBJDIR)/threadfork.o \
 	$(OBJDIR)/timelinepane.o \
 	$(OBJDIR)/timebar.o \
 	$(OBJDIR)/timeentry.o \
@@ -326,6 +322,7 @@ OBJS = \
 	$(OBJDIR)/vdevicempeg.o \
 	$(OBJDIR)/vdevicev4l2mpeg.o \
 	$(OBJDIR)/wwindow.o \
+	$(OBJDIR)/pluginfclient.o \
 
 #	$(OBJDIR)/renderfarmfsclient.o \
 #	$(OBJDIR)/renderfarmfsserver.o \
@@ -344,9 +341,7 @@ LIBRARIES := \
 	$(THEME_DATA) \
 
 LIBS = $(LIBRARIES)
-LIBS += $(thirdparty_libraries)
-LIBS += $(thirdparty_libraries)
-LIBS += $(thirdparty_libraries)
+LIBS += $(thirdparty_libraries) $(static_libraries)
 LIBS += \
 	-lX11 \
 	-lXext \
@@ -361,7 +356,9 @@ LIBS += \
 	-llzma \
 	-lfontconfig \
 	-lfreetype \
-	$(EXTRA_LIBS)
+
+LIBS += -Wl,--start-group $(thirdparty_libraries) -Wl,--end-group 
+LIBS += $(EXTRA_LIBS)
 
 CUTADS = $(OBJDIR)/cutads
 CUTOBJ = $(OBJDIR)/cutads.o
@@ -452,20 +449,10 @@ $(CUTADS):	$(CUTOBJS) $(CUTLIBS)
 	@echo g++ -o $@ $(CUTOBJS)
 	@g++ $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS)
 
-$(BDWRITE):	$(BDWOBJS)
+$(BDWRITE):	$(BDWOBJS) $(LIBRARIES)
 	@echo g++ -o $@ $(BDWOBJS)
 	@g++ $(CFLAGS) -pthread -o $@ $(BDWOBJS) $(LIBS)
 
-$(OBJDIR)/test:
-	$(CC) -shared -o $(OBJDIR)/test.so \
-		$(OBJDIR)/threadfork.o \
-		../guicast/$(OBJDIR)/thread.o \
-		../guicast/$(OBJDIR)/mutex.o
-	$(CC) -o $(OBJDIR)/test test.C \
-		`cat $(OBJDIR)/c_flags` \
-		$(OBJDIR)/test.so \
-		$(LIBS)
-
 clean:
 	rm -rf $(OBJDIR)
 	find \( -name core \