X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2FMakefile.am;h=b15546ca57fec572ef824e23ce97e25a3aab2e46;hb=72a6abf751403bd91464e77ff2cece01c9756a6b;hp=5085f0e7834b424afb9e1ae407a7f12b02b6aa87;hpb=d88c3be6fc4c1f0330ce4b2dda183ea53f87f8b5;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/Makefile.am b/cinelerra-5.1/Makefile.am
index 5085f0e7..b15546ca 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:
@@ -34,8 +34,9 @@ binstall:	install-recursive
 	cp -a COPYING README models ffmpeg msg.txt bin/.
 	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 db/utils/new_db "bin/cin_db"
 
 buninstall:
 	rm -rf bin
@@ -43,22 +44,21 @@ buninstall:
 # with system_build
 cinstall:
 	cd bin; $(inst_sh) "$(DESTDIR)$(bindir)" "$(WANT_CIN)" \
-		mpeg3{cat,cc2txt,ifochk,show,toc}
+		cin_db mpeg3{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
 	cd bin/locale; $(inst_sh) "$(DESTDIR)$(localedir)" .
 	cd bin/plugins; $(inst_sh) "$(DESTDIR)$(WANT_PLUGIN_DIR)" .
-	if test "x$(WANT_LADSPA_BUILD)" = "xyes"; then \
-	  cd bin/ladspa; $(inst_sh) "$(DESTDIR)$(WANT_LADSPA_DIR)" . ; \
-	fi
+	cd bin/ladspa; $(inst_sh) "$(DESTDIR)$(WANT_LADSPA_DIR)" .
 	cd bin/applications; $(inst_sh) "$(DESTDIR)$(datadir)/applications" .
 	cd bin/pixmaps; $(inst_sh) "$(DESTDIR)$(datadir)/pixmaps" .
 
 cuninstall:
 	rm -f "$(DESTDIR)$(bindir)/$(WANT_CIN)"
 	rm -f "$(DESTDIR)$(bindir)"/mpeg3{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"