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 b4925615645a57c99caa0144ccdfa8b516436b8e..0e5a8f1abef4ec73b180813ff30eb08bda73353e 100644 (file)
--- a/cinelerra-5.1/db/utils/Makefile
+++ b/cinelerra-5.1/db/utils/Makefile
@@ -1,11 +1,9 @@
-
-OBJDIR := $(shell uname -m)
-
-TOPDIR=../..
+export TOPDIR ?= $(CURDIR)/../..
 include $(TOPDIR)/global_config
-include $(THIRDPARTY)/config.mak
 
-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:=
 
@@ -34,28 +32,32 @@ 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
 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_LIBS += $(libraries)
+
 XTV_INCLUDES := -I$(TOPDIR) -I$(TOPDIR)/guicast
-XTV_INCLUDES += $(static_includes)
+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
 
+install:
+
 clean:
        rm -f $(TARGETS) *.o a.out