delete stray line in last checkin

[goodguy/history.git] / cinelerra-5.1 / db / utils / Makefile

diff --git a/cinelerra-5.1/db/utils/Makefile b/cinelerra-5.1/db/utils/Makefile
index 66179f921796b0c53913d01f3e44671ca512948f..0e5a8f1abef4ec73b180813ff30eb08bda73353e 100644 (file)
--- a/cinelerra-5.1/db/utils/Makefile
+++ b/cinelerra-5.1/db/utils/Makefile
@@ -1,8 +1,9 @@
+export TOPDIR ?= $(CURDIR)/../..
+include $(TOPDIR)/global_config
 
-OBJDIR := $(shell uname --machine)
-
-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,22 +32,31 @@ 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)
+       @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
 
-xtv:   xtv.C $(XTV_MEDIA_OBJS) $(XTV_LIBS)
-       c++ -pthread $(XTV_INCLUDES) $(CXXFLAGS) xtv.C $(XTV_MEDIA_OBJS) $(XTV_LIBS) -o xtv
+install:
 
 clean:
        rm -f $(TARGETS) *.o a.out