projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve inst.sh, menubar, pankeyframe.png
[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..12e0abef7b08f683c0c2e96b2ead0d6a7ebb8e05 100644
(file)
--- a/
cinelerra-5.1/db/utils/Makefile
+++ b/
cinelerra-5.1/db/utils/Makefile
@@
-1,11
+1,10
@@
-
-OBJDIR := $(shell uname -m)
-
-TOPDIR=../..
+TOPDIR ?= $(CURDIR)/../..
+export TOPDIR
include $(TOPDIR)/global_config
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:=
LDLIBS:=../$(OBJDIR)/db.a
LDFLAGS:=
@@
-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