X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fdb%2Futils%2FMakefile;h=b4925615645a57c99caa0144ccdfa8b516436b8e;hb=235c9cc4df8306babbbfda46189108fe262d44ef;hp=66179f921796b0c53913d01f3e44671ca512948f;hpb=b0adaf11e855fd84af935d879848467a957d6c67;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/db/utils/Makefile b/cinelerra-5.1/db/utils/Makefile
index 66179f92..b4925615 100644
--- a/cinelerra-5.1/db/utils/Makefile
+++ b/cinelerra-5.1/db/utils/Makefile
@@ -1,7 +1,10 @@
 
-OBJDIR := $(shell uname --machine)
+OBJDIR := $(shell uname -m)
 
 TOPDIR=../..
+include $(TOPDIR)/global_config
+include $(THIRDPARTY)/config.mak
+
 CXXFLAGS:=-ggdb -I.. -Wall $(CFLAGS)
 LDLIBS:=../$(OBJDIR)/db.a
 LDFLAGS:=
@@ -41,12 +44,17 @@ all:	$(TARGETS)
 dbtv:	dbtv.C
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) dbtv.C $(LDLIBS) -lX11 -o $@
 
-XTV_MEDIA_OBJS:=$(TOPDIR)/cinelerra/$(OBJDIR)/mediadb.o $(TOPDIR)/cinelerra/$(OBJDIR)/filexml.o
-XTV_LIBS:=$(TOPDIR)/libzmpeg3/$(OBJDIR)/libzmpeg3.a $(TOPDIR)/db/$(OBJDIR)/db.a -lX11 -lXext -lasound -lm
-XTV_INCLUDES:=-I$(TOPDIR) -I$(TOPDIR)/guicast
-
-xtv:	xtv.C $(XTV_MEDIA_OBJS) $(XTV_LIBS)
-	c++ -pthread $(XTV_INCLUDES) $(CXXFLAGS) xtv.C $(XTV_MEDIA_OBJS) $(XTV_LIBS) -o xtv
+XTV_MEDIA_OBJS := $(TOPDIR)/cinelerra/$(OBJDIR)/mediadb.o $(TOPDIR)/cinelerra/$(OBJDIR)/filexml.o
+XTV_LIBS := $(TOPDIR)/libzmpeg3/$(OBJDIR)/libzmpeg3.a
+XTV_LIBS += $(TOPDIR)/db/$(OBJDIR)/db.a
+XTV_LIBS += -Wl,--start-group $(thirdparty_libraries) -Wl,--end-group 
+XTV_LIBS += -lX11 -lXext -lasound -lm $(EXTRA_LIBS)
+XTV_INCLUDES := -I$(TOPDIR) -I$(TOPDIR)/guicast
+XTV_INCLUDES += $(static_includes)
+
+xtv:	xtv.C $(XTV_MEDIA_OBJS)
+	@echo c++ -pthread $(CXXFLAGS) xtv.C $(XTV_MEDIA_OBJS) -o xtv
+	@c++ -pthread $(XTV_INCLUDES) $(CXXFLAGS) xtv.C $(XTV_MEDIA_OBJS) $(XTV_LIBS) -o xtv
 
 clean:
 	rm -f $(TARGETS) *.o a.out