X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fdb%2Futils%2FMakefile;h=cd1a4973cfd416a809af81987e5e0347697e388d;hb=5c1aff2fd123b65be6e51ca7652185e14ddaf168;hp=66179f921796b0c53913d01f3e44671ca512948f;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/db/utils/Makefile b/cinelerra-5.1/db/utils/Makefile
index 66179f92..cd1a4973 100644
--- a/cinelerra-5.1/db/utils/Makefile
+++ b/cinelerra-5.1/db/utils/Makefile
@@ -1,8 +1,11 @@
+export TOPDIR ?= $(CURDIR)/../..
+include $(TOPDIR)/global_config
 
-OBJDIR := $(shell uname --machine)
+ifneq ($(WANT_COMMERCIAL),no)
 
-TOPDIR=../..
-CXXFLAGS:=-ggdb -I.. -Wall $(CFLAGS)
+$(shell mkdir -p $(OBJDIR))
+$(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
+CXXFLAGS:=-ggdb -I.. -Wall `cat $(OBJDIR)/c_flags`
 LDLIBS:=../$(OBJDIR)/db.a
 LDFLAGS:=
 
@@ -31,23 +34,38 @@ TARGETS:=clip_accesses \
 	root_info \
 	dmp \
 	cpdb \
-	add_path_pos \
 	path_ls \
-	dbcvt \
 	xtv
 
+#	add_path_pos \
+#	dbcvt \
+
 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_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 += $(libraries)
+
+XTV_INCLUDES := -I$(TOPDIR) -I$(TOPDIR)/guicast
+XTV_INCLUDES += $(static_incs)
 
-xtv:	xtv.C $(XTV_MEDIA_OBJS) $(XTV_LIBS)
-	c++ -pthread $(XTV_INCLUDES) $(CXXFLAGS) xtv.C $(XTV_MEDIA_OBJS) $(XTV_LIBS) -o xtv
+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
+
+install:
 
 clean:
 	rm -f $(TARGETS) *.o a.out
 
+else
+#not WANT_COMMERCIAL
+all:
+install:
+clean:
+endif