projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use autoconf/automake for configuration
[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..62314c7875842f05a0fa06c3de9c2792cff9a5f6 100644
(file)
--- a/
cinelerra-5.1/db/utils/Makefile
+++ b/
cinelerra-5.1/db/utils/Makefile
@@
-1,9
+1,8
@@
-
-OBJDIR := $(shell uname -m)
-
-TOPDIR=../..
+TOPDIR ?= $(CURDIR)/../..
+export TOPDIR
include $(TOPDIR)/global_config
include $(TOPDIR)/global_config
-include $(THIRDPARTY)/config.mak
+
+$(shell mkdir -p $(OBJDIR))
CXXFLAGS:=-ggdb -I.. -Wall $(CFLAGS)
LDLIBS:=../$(OBJDIR)/db.a
CXXFLAGS:=-ggdb -I.. -Wall $(CFLAGS)
LDLIBS:=../$(OBJDIR)/db.a
@@
-45,12
+44,13
@@
dbtv: dbtv.C
$(CXX) $(CXXFLAGS) $(LDFLAGS) dbtv.C $(LDLIBS) -lX11 -o $@
XTV_MEDIA_OBJS := $(TOPDIR)/cinelerra/$(OBJDIR)/mediadb.o $(TOPDIR)/cinelerra/$(OBJDIR)/filexml.o
$(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 := $(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 := -I$(TOPDIR) -I$(TOPDIR)/guicast
-XTV_INCLUDES += $(static_inc
lude
s)
+XTV_INCLUDES += $(static_incs)
xtv: xtv.C $(XTV_MEDIA_OBJS)
@echo c++ -pthread $(CXXFLAGS) xtv.C $(XTV_MEDIA_OBJS) -o xtv
xtv: xtv.C $(XTV_MEDIA_OBJS)
@echo c++ -pthread $(CXXFLAGS) xtv.C $(XTV_MEDIA_OBJS) -o xtv