X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2FMakefile.am;h=0667d93ce2c1ad576bf8a7d742b42f8913eb33b8;hb=74afbc29ac4ce9d94d53e10342979f2c59f1f193;hp=95fc4ee3131165c54b8510d1736789da8b097ea9;hpb=3406c79cd1a832418ad3a8b3de7a823b79ff5675;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/Makefile.am b/cinelerra-5.1/Makefile.am index 95fc4ee3..0667d93c 100644 --- 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) @@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS=foreign 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: @@ -31,11 +31,17 @@ export mkinstalldirs install_sh inst_sh # 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/\/$(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 + 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 @@ -43,11 +49,11 @@ buninstall: # with system_build cinstall: cd bin; $(inst_sh) "$(DESTDIR)$(bindir)" "$(WANT_CIN)" \ - mpeg3{cat,cc2txt,ifochk,show,toc} + cin_db zmpeg3{cat,cc2txt,ifochk,show,toc} cd bin; $(inst_sh) "$(DESTDIR)$(WANT_CINLIB_DIR)" \ bdwrite cutads hveg2enc mpeg2enc mplex mplexlo cd bin; $(inst_sh) "$(DESTDIR)$(datadir)/$(WANT_CIN)" \ - COPYING README msg.txt ffmpeg doc models + COPYING README models 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)" . @@ -56,7 +62,8 @@ cinstall: 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"