--- Makefile.am.orig 2019-01-07 17:42:04.350772281 +0100
+++ Makefile.am 2019-01-07 17:46:43.835265927 +0100
@@ -35,12 +35,12 @@
# this lists the binaries to produce, the (non-PHONY, binary) targets in
# the previous manual Makefile
lib_LTLIBRARIES = libags.la libags_thread.la libags_server.la libags_audio.la libags_gui.la
-# lib_LTLIBRARIES += libgsequencer.la
+lib_LTLIBRARIES += libgsequencer.la
bin_PROGRAMS = gsequencer midi2xml
-libgsequencerdir = $(libdir)/gsequencer
-libgsequencer_LTLIBRARIES = libgsequencer.la
+# libgsequencerdir = $(libdir)/gsequencer
+# libgsequencer_LTLIBRARIES = libgsequencer.la
EXTRA_DIST = config.rpath \
COPYING.server \
@@ -134,10 +134,10 @@
# pkg-config
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libags.pc libags_audio.pc libags_gui.pc
-# pkgconfig_DATA += libgsequencer.pc
+pkgconfig_DATA += libgsequencer.pc
EXTRA_DIST += libags.pc.in libags_audio.pc.in libags_gui.pc.in libgsequencer.pc.in
-# EXTRA_DIST += libgsequencer.pc.in
+EXTRA_DIST += libgsequencer.pc.in
# desktop file
appdatadir = $(datadir)/applications
@@ -177,7 +177,7 @@
# include
otherincludedir = $(includedir)/ags
nobase_include_HEADERS = $(libags_la_HEADERS_0) $(libags_thread_la_HEADERS_0) $(libags_server_la_HEADERS_0) $(libags_audio_la_HEADERS_0) $(libags_gui_la_HEADERS_0)
-# nobase_include_HEADERS += $(libgsequencer_la_HEADERS_0)
+nobase_include_HEADERS += $(libgsequencer_la_HEADERS_0)
# doc
# docdir = $(datadir)/doc/gsequencer
@@ -2066,9 +2066,9 @@
html:
mkdir -p $(top_builddir)/html/
mkdir -p $(top_builddir)/html/{developer-docs,user-docs,osc-docs}
- xsltproc --output $(top_builddir)/html/user-docs/ --xinclude /usr/share/xml/docbook/stylesheet/docbook-xsl/htmlhelp/htmlhelp.xsl $(top_srcdir)/docs/usersBook.xml
- xsltproc --output $(top_builddir)/html/developer-docs/ --xinclude /usr/share/xml/docbook/stylesheet/docbook-xsl/htmlhelp/htmlhelp.xsl $(top_srcdir)/docs/developersBook.xml
- xsltproc --output $(top_builddir)/html/osc-docs/ --xinclude /usr/share/xml/docbook/stylesheet/docbook-xsl/htmlhelp/htmlhelp.xsl $(top_srcdir)/docs/oscBook.xml
+ xsltproc --output $(top_builddir)/html/user-docs/ --xinclude /usr/share/sgml/docbook/xsl-stylesheets/htmlhelp/htmlhelp.xsl $(top_srcdir)/docs/usersBook.xml
+ xsltproc --output $(top_builddir)/html/developer-docs/ --xinclude /usr/share/sgml/docbook/xsl-stylesheets/htmlhelp/htmlhelp.xsl $(top_srcdir)/docs/developersBook.xml
+ xsltproc --output $(top_builddir)/html/osc-docs/ --xinclude /usr/share/sgml/docbook/xsl-stylesheets/htmlhelp/htmlhelp.xsl $(top_srcdir)/docs/oscBook.xml
$(MAKE) -C $(top_srcdir)/docs/reference/libags
cd $(top_srcdir)
$(MAKE) -C $(top_srcdir)/docs/reference/libags-audio
@@ -2111,18 +2111,18 @@
gzip -9 -c $(top_srcdir)/ChangeLog > $(DESTDIR)/$(docdir)/changelog.gz
fix-local-html: html
- find $(top_srcdir)/docs/reference/libags/libags-html -name "*.html" -type f -exec sed -i 's/\.\.\/gobject/\/usr\/share\/doc\/libglib2.0-doc\/gobject/g' {} \;
- find $(top_srcdir)/docs/reference/libags-audio/libags-audio-html -name "*.html" -type f -exec sed -i 's/\.\.\/gobject/\/usr\/share\/doc\/libglib2.0-doc\/gobject/g' {} \;
- find $(top_srcdir)/docs/reference/libags-audio/libags-audio-html -name "*.html" -type f -exec sed -i 's/\.\.\/libags-html/\/usr\/share\/doc\/libags-doc\/api/g' {} \;
- find $(top_srcdir)/docs/reference/libags-gui/libags-gui-html -name "*.html" -type f -exec sed -i 's/\.\.\/gobject/\/usr\/share\/doc\/libglib2.0-doc\/gobject/g' {} \;
- find $(top_srcdir)/docs/reference/libags-gui/libags-gui-html -name "*.html" -type f -exec sed -i 's/\.\.\/gtk2/\/usr\/share\/doc\/libgtk2.0-doc\/gtk2/g' {} \;
- find $(top_srcdir)/docs/reference/libags-gui/libags-gui-html -name "*.html" -type f -exec sed -i 's/\.\.\/gtk3/\/usr\/share\/doc\/libgtk2.0-doc\/gtk2/g' {} \;
- find $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html -name "*.html" -type f -exec sed -i 's/\.\.\/gobject/\/usr\/share\/doc\/libglib2.0-doc\/gobject/g' {} \;
- find $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html -name "*.html" -type f -exec sed -i 's/\.\.\/gtk2/\/usr\/share\/doc\/libgtk2.0-doc\/gtk2/g' {} \;
- find $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html -name "*.html" -type f -exec sed -i 's/\.\.\/gtk3/\/usr\/share\/doc\/libgtk2.0-doc\/gtk2/g' {} \;
- find $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html -name "*.html" -type f -exec sed -i 's/\.\.\/libags-html/\/usr\/share\/doc\/libags-doc\/api/g' {} \;
- find $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html -name "*.html" -type f -exec sed -i 's/\.\.\/libags-audio-html/\/usr\/share\/doc\/libags-audio-doc\/api/g' {} \;
- find $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html -name "*.html" -type f -exec sed -i 's/\.\.\/libags-gui-html/\/usr\/share\/doc\/libags-gui-doc\/api/g' {} \;
+ find $(top_srcdir)/docs/reference/libags/libags-html -name "*.html" -type f -exec sed -i 's/\.\.\/gobject/\.\.\/gobject/g' {} \;
+ find $(top_srcdir)/docs/reference/libags-audio/libags-audio-html -name "*.html" -type f -exec sed -i 's/\.\.\/gobject/\.\.\/gobject/g' {} \;
+ find $(top_srcdir)/docs/reference/libags-audio/libags-audio-html -name "*.html" -type f -exec sed -i 's/\.\.\/libags-html/\.\.\/libags/g' {} \;
+ find $(top_srcdir)/docs/reference/libags-gui/libags-gui-html -name "*.html" -type f -exec sed -i 's/\.\.\/gobject/\.\.\/gobject/g' {} \;
+ find $(top_srcdir)/docs/reference/libags-gui/libags-gui-html -name "*.html" -type f -exec sed -i 's/\.\.\/gtk2/\.\.\/gtk2/g' {} \;
+ find $(top_srcdir)/docs/reference/libags-gui/libags-gui-html -name "*.html" -type f -exec sed -i 's/\.\.\/gtk3/\.\.\/gtk2/g' {} \;
+ find $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html -name "*.html" -type f -exec sed -i 's/\.\.\/gobject/\.\.\/gobject/g' {} \;
+ find $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html -name "*.html" -type f -exec sed -i 's/\.\.\/gtk2/\.\.\/gtk2/g' {} \;
+ find $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html -name "*.html" -type f -exec sed -i 's/\.\.\/gtk3/\.\.\/gtk2/g' {} \;
+ find $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html -name "*.html" -type f -exec sed -i 's/\.\.\/libags-html/\.\.\/libags/g' {} \;
+ find $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html -name "*.html" -type f -exec sed -i 's/\.\.\/libags-audio-html/\.\.\/libags_audio/g' {} \;
+ find $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html -name "*.html" -type f -exec sed -i 's/\.\.\/libags-gui-html/\.\.\/libags_gui/g' {} \;
fix-online-books-html: html
find $(top_srcdir)/html/ -name "*.html" -type f -exec sed -i 's/\/usr\/share\/icons\/Adwaita\/32x32\/actions/..\/images/g' {} \;
@@ -2150,19 +2150,11 @@
install -c -p -m 644 $(top_builddir)/html/user-docs/* $(DESTDIR)/$(docdir)/html/
install -c -p -m 644 $(top_builddir)/html/developer-docs/* $(DESTDIR)/$(datadir)/doc/libags-audio-doc/html/
install -c -p -m 644 $(top_builddir)/html/osc-docs/* $(DESTDIR)/$(datadir)/doc/libags-audio-doc/osc-server/
- mkdir -p $(DESTDIR)/$(datadir)/gtk-doc/html
- mkdir -p $(DESTDIR)/$(datadir)/doc/libags-doc/api
- mkdir -p $(DESTDIR)/$(datadir)/doc/libags-audio-doc/api
- mkdir -p $(DESTDIR)/$(datadir)/doc/libags-gui-doc/api
- mkdir -p $(DESTDIR)/$(datadir)/doc/libgsequencer-doc/api
- ln -s ../../../gtk-doc/html/libags $(DESTDIR)/$(datadir)/doc/libags-doc/api
- ln -s ../../../gtk-doc/html/libags_audio $(DESTDIR)/$(datadir)/doc/libags-audio-doc/api
- ln -s ../../../gtk-doc/html/libags_gui $(DESTDIR)/$(datadir)/doc/libags-gui-doc/api
- ln -s ../../../gtk-doc/html/libgsequencer $(DESTDIR)/$(datadir)/doc/libgsequencer-doc/api
- install -c -p -m 644 $(top_srcdir)/docs/reference/libags/libags-html/* $(DESTDIR)/$(datadir)/doc/libags-doc/api
- install -c -p -m 644 $(top_srcdir)/docs/reference/libags-audio/libags-audio-html/* $(DESTDIR)/$(datadir)/doc/libags-audio-doc/api
- install -c -p -m 644 $(top_srcdir)/docs/reference/libags-gui/libags-gui-html/* $(DESTDIR)/$(datadir)/doc/libags-gui-doc/api
- install -c -p -m 644 $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html/* $(DESTDIR)/$(datadir)/doc/libgsequencer-doc/api
+ mkdir -p $(DESTDIR)/$(datadir)/gtk-doc/html/{libags,libags_audio,libags_gui,libgsequencer}
+ install -c -p -m 644 $(top_srcdir)/docs/reference/libags/libags-html/* $(DESTDIR)/$(datadir)/gtk-doc/html/libags/
+ install -c -p -m 644 $(top_srcdir)/docs/reference/libags-audio/libags-audio-html/* $(DESTDIR)/$(datadir)/gtk-doc/html/libags_audio
+ install -c -p -m 644 $(top_srcdir)/docs/reference/libags-gui/libags-gui-html/* $(DESTDIR)/$(datadir)/gtk-doc/html/libags_gui
+ install -c -p -m 644 $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html/* $(DESTDIR)/$(datadir)/gtk-doc/html/libgsequencer
uninstall-hook:
rm -rf $(DESTDIR)/$(includedir)/ags/config.h