projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renderfarmclient uninitialized defaults pointer
[goodguy/history.git]
/
cinelerra-5.1
/
Makefile.am
diff --git
a/cinelerra-5.1/Makefile.am
b/cinelerra-5.1/Makefile.am
index 95fc4ee3131165c54b8510d1736789da8b097ea9..5200484f4fb1afb2f1be8c63740fbe6a3981fa40 100644
(file)
--- a/
cinelerra-5.1/Makefile.am
+++ b/
cinelerra-5.1/Makefile.am
@@
-1,8
+1,8
@@
-
PKG_
CFLAGS_ := $(CFLAGS)
-
PKG_
CXXFLAGS_ := $(CXXFLAGS)
-
PKG_
LDFLAGS_ := $(LDFLAGS)
+CFLAGS_ := $(CFLAGS)
+CXXFLAGS_ := $(CXXFLAGS)
+LDFLAGS_ := $(LDFLAGS)
-export
PKG_CFLAGS_ PKG_CXXFLAGS_ PKG_
LDFLAGS_
+export
CFLAGS_ CXXFLAGS_
LDFLAGS_
unexport CFLAGS CXXFLAGS LDFLAGS
AM_MAKEFLAGS := -j$(WANT_JOBS)
unexport CFLAGS CXXFLAGS LDFLAGS
AM_MAKEFLAGS := -j$(WANT_JOBS)
@@
-11,13
+11,14
@@
AUTOMAKE_OPTIONS=foreign
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = thirdparty libzmpeg3 mpeg2enc mplexlo \
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = thirdparty libzmpeg3 mpeg2enc mplexlo \
- db guicast cinelerra plugins doc po
+ db guicast cinelerra plugins doc po
db/utils
BUILT_SOURCES := bin
bin:
mkdir -p bin bin/applications bin/pixmaps
clean-generic:
BUILT_SOURCES := bin
bin:
mkdir -p bin bin/applications bin/pixmaps
clean-generic:
+ rm -rf thirdparty/opencv*
rm -rf bin
inst_sh := $(CURDIR)/inst.sh
rm -rf bin
inst_sh := $(CURDIR)/inst.sh
@@
-31,11
+32,17
@@
export mkinstalldirs install_sh inst_sh
# install to bin
binstall: install-recursive
# install to bin
binstall: install-recursive
- cp -a COPYING README models
ffmpeg msg.txt
bin/.
+ cp -a COPYING README models
Cinelerra_factory ffmpeg msg info tips
bin/.
sed -e 's/\<cin\>/$(WANT_CIN)/g' < image/cin.desktop \
> "bin/applications/$(WANT_CIN).desktop"
sed -e 's/\<cin\>/$(WANT_CIN)/g' < image/cin.desktop \
> "bin/applications/$(WANT_CIN).desktop"
- cp -a image/cin.svg "bin/pixmaps/
?
$(WANT_CIN)".svg
+ cp -a image/cin.svg "bin/pixmaps/$(WANT_CIN)".svg
cp -a image/cin.xpm "bin/pixmaps/$(WANT_CIN)".xpm
cp -a image/cin.xpm "bin/pixmaps/$(WANT_CIN)".xpm
+ mkdir -p bin/plugins/picon/cinfinity
+ for d in picon/*; do \
+ if [ $$d = picon/cinfinity ]; then continue; fi; \
+ cp -a $$d bin/plugins/picon/.; \
+ done
+ cp -a db/utils/new_db "bin/cin_db"
buninstall:
rm -rf bin
buninstall:
rm -rf bin
@@
-43,11
+50,11
@@
buninstall:
# with system_build
cinstall:
cd bin; $(inst_sh) "$(DESTDIR)$(bindir)" "$(WANT_CIN)" \
# with system_build
cinstall:
cd bin; $(inst_sh) "$(DESTDIR)$(bindir)" "$(WANT_CIN)" \
- mpeg3{cat,cc2txt,ifochk,show,toc}
+
cin_db z
mpeg3{cat,cc2txt,ifochk,show,toc}
cd bin; $(inst_sh) "$(DESTDIR)$(WANT_CINLIB_DIR)" \
cd bin; $(inst_sh) "$(DESTDIR)$(WANT_CINLIB_DIR)" \
- bdwrite cutads hveg2enc mpeg2enc mplex mplexlo
+ bdwrite cutads
lv2ui
hveg2enc mpeg2enc mplex mplexlo
cd bin; $(inst_sh) "$(DESTDIR)$(datadir)/$(WANT_CIN)" \
cd bin; $(inst_sh) "$(DESTDIR)$(datadir)/$(WANT_CIN)" \
- COPYING README m
sg.txt ffmpeg doc models
+ COPYING README m
odels Cinelerra_factory ffmpeg msg info tips doc
cd bin/locale; $(inst_sh) "$(DESTDIR)$(localedir)" .
cd bin/plugins; $(inst_sh) "$(DESTDIR)$(WANT_PLUGIN_DIR)" .
cd bin/ladspa; $(inst_sh) "$(DESTDIR)$(WANT_LADSPA_DIR)" .
cd bin/locale; $(inst_sh) "$(DESTDIR)$(localedir)" .
cd bin/plugins; $(inst_sh) "$(DESTDIR)$(WANT_PLUGIN_DIR)" .
cd bin/ladspa; $(inst_sh) "$(DESTDIR)$(WANT_LADSPA_DIR)" .
@@
-56,7
+63,8
@@
cinstall:
cuninstall:
rm -f "$(DESTDIR)$(bindir)/$(WANT_CIN)"
cuninstall:
rm -f "$(DESTDIR)$(bindir)/$(WANT_CIN)"
- rm -f "$(DESTDIR)$(bindir)"/mpeg3{cat,cc2txt,ifochk,show,toc}
+ rm -f "$(DESTDIR)$(bindir)"/zmpeg3{cat,cc2txt,ifochk,show,toc}
+ rm -f "$(DESTDIR)$(bindir)/cin_db"
rm -rf "$(DESTDIR)$(WANT_CINLIB_DIR)"
rm -rf "$(DESTDIR)$(datadir)/$(WANT_CIN)"
rm -rf "$(DESTDIR)$(localedir)"/*/"LC_MESSAGES/$(WANT_CIN).mo"
rm -rf "$(DESTDIR)$(WANT_CINLIB_DIR)"
rm -rf "$(DESTDIR)$(datadir)/$(WANT_CIN)"
rm -rf "$(DESTDIR)$(localedir)"/*/"LC_MESSAGES/$(WANT_CIN).mo"