aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog35
-rw-r--r--bindings/mono/Makefile.am5
-rw-r--r--bindings/mono/Makefile.in5
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac4
-rw-r--r--debian/changelog42
-rw-r--r--docs/reference/libappindicator-docs.sgml2
-rw-r--r--docs/reference/version.xml2
-rw-r--r--gtk-doc.make94
-rw-r--r--src/Makefile.in9
10 files changed, 155 insertions, 63 deletions
diff --git a/ChangeLog b/ChangeLog
index b35c30d..80ee11c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,40 @@
# Generated by Makefile. Do not edit.
+2010-05-20 Ted Gould <ted@gould.cx>
+
+ Build fix to include the AssemblyInfo.cs file
+
+2010-05-20 Ted Gould <ted@gould.cx>
+
+ 0.0.20
+
+2010-05-20 Ted Gould <ted@gould.cx>
+
+ Fixing the ref leakage of a child object.
+
+2010-05-19 Ted Gould <ted@gould.cx>
+
+ Changing it so the object gets unref'd
+
+2010-04-14 Ted Gould <ted@gould.cx>
+
+ Adding assembly info for Mono bindings
+
+2010-04-14 Cody Russell <crussell@canonical.com>
+
+ Add AssemblyInfo.cs to the Mono bindings.
+
+2010-04-13 Neil Jagdish Patel <neil.patel@canonical.com>
+
+ Add G_LOG_DOMAIN support to the various targets for better messages
+
+ modified:
+ src/Makefile.am
+
+2010-04-01 Ted Gould <ted@gould.cx>
+
+ 0.0.19
+
2010-04-01 Ted Gould <ted@gould.cx>
Fixing documentation distcheck
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index e573c9b..7e2b0d2 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -19,6 +19,7 @@ DISTCLEANFILES = $(ASSEMBLY).config
TEST_SOURCES = TestIndicator.cs
customs = ApplicationIndicator.custom
EXTRA_DIST = \
+ AssemblyInfo.cs \
$(RAW_API) \
$(METADATA) \
appindicator-sharp-0.1.pc.in \
@@ -74,9 +75,9 @@ generated-stamp: $(API) $(build_customs)
--outdir=generated --assembly-name=$(ASSEMBLY_NAME) \
&& touch generated-stamp
-$(ASSEMBLY): generated-stamp
+$(ASSEMBLY): generated-stamp $(srcdir)/AssemblyInfo.cs
@rm -f $(ASSEMBLY).mdb
- $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs
+ $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) $(srcdir)/AssemblyInfo.cs
install-data-local:
echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \
diff --git a/bindings/mono/Makefile.in b/bindings/mono/Makefile.in
index f029d16..647cc48 100644
--- a/bindings/mono/Makefile.in
+++ b/bindings/mono/Makefile.in
@@ -296,6 +296,7 @@ DISTCLEANFILES = $(ASSEMBLY).config
TEST_SOURCES = TestIndicator.cs
customs = ApplicationIndicator.custom
EXTRA_DIST = \
+ AssemblyInfo.cs \
$(RAW_API) \
$(METADATA) \
appindicator-sharp-0.1.pc.in \
@@ -747,9 +748,9 @@ generated-stamp: $(API) $(build_customs)
--outdir=generated --assembly-name=$(ASSEMBLY_NAME) \
&& touch generated-stamp
-$(ASSEMBLY): generated-stamp
+$(ASSEMBLY): generated-stamp $(srcdir)/AssemblyInfo.cs
@rm -f $(ASSEMBLY).mdb
- $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES)
+ $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) $(srcdir)/AssemblyInfo.cs
install-data-local:
echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \
diff --git a/configure b/configure
index 2d8a7ab..e0b0ea9 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for indicator-application 0.0.19.
+# Generated by GNU Autoconf 2.65 for indicator-application 0.0.21.
#
# Report bugs to <ted@canonical.com>.
#
@@ -703,8 +703,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='indicator-application'
PACKAGE_TARNAME='indicator-application'
-PACKAGE_VERSION='0.0.19'
-PACKAGE_STRING='indicator-application 0.0.19'
+PACKAGE_VERSION='0.0.21'
+PACKAGE_STRING='indicator-application 0.0.21'
PACKAGE_BUGREPORT='ted@canonical.com'
PACKAGE_URL=''
@@ -1493,7 +1493,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures indicator-application 0.0.19 to adapt to many kinds of systems.
+\`configure' configures indicator-application 0.0.21 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1564,7 +1564,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of indicator-application 0.0.19:";;
+ short | recursive ) echo "Configuration of indicator-application 0.0.21:";;
esac
cat <<\_ACEOF
@@ -1695,7 +1695,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-indicator-application configure 0.0.19
+indicator-application configure 0.0.21
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1975,7 +1975,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by indicator-application $as_me 0.0.19, which was
+It was created by indicator-application $as_me 0.0.21, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2789,7 +2789,7 @@ fi
# Define the identity of the package.
PACKAGE=indicator-application
- VERSION=0.0.19
+ VERSION=0.0.21
cat >>confdefs.h <<_ACEOF
@@ -13523,7 +13523,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by indicator-application $as_me 0.0.19, which was
+This file was extended by indicator-application $as_me 0.0.21, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13589,7 +13589,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-indicator-application config.status 0.0.19
+indicator-application config.status 0.0.21
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index c34bed2..9d5b26d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(indicator-application, 0.0.19, ted@canonical.com)
+AC_INIT(indicator-application, 0.0.21, ted@canonical.com)
AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.0.19)
+AM_INIT_AUTOMAKE(indicator-application, 0.0.21)
AM_MAINTAINER_MODE
diff --git a/debian/changelog b/debian/changelog
index 957453b..8718895 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,31 @@ indicator-application (0.2.0~dev-0ubuntu1~ppa1) lucid; urgency=low
-- Ted Gould <ted@ubuntu.com> Wed, 19 May 2010 14:04:29 -0500
-indicator-application (0.0.19-0ubuntu4) UNRELEASED; urgency=low
+indicator-application (0.0.21-0ubuntu1~ppa1) lucid; urgency=low
+
+ * New upstream release.
+ * Adding AssemblyInfo.cs for building
+
+ -- Ted Gould <ted@ubuntu.com> Thu, 20 May 2010 21:59:48 -0500
+
+indicator-application (0.0.20-0ubuntu1~ppa1) lucid; urgency=low
+
+ * New upstream release.
+ * Unref the child when created in libappindicator (LP: #569273)
+ * Merging patch to add assembly information to Mono
+ binding (LP: #547195)
+ * Remove child-leakage.patch as merged upstream
+
+ -- Ted Gould <ted@ubuntu.com> Thu, 20 May 2010 21:56:44 -0500
+
+indicator-application (0.0.19-0ubuntu5) lucid-proposed; urgency=low
+
+ * debian/patches/child-leakage.patch
+ - Fixes a memory leak (LP: #569273)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 20 May 2010 07:35:33 -0400
+
+indicator-application (0.0.19-0ubuntu4) lucid; urgency=low
* bindings/mono/appindicator-sharp-0.1.pc.in:
+ Fix pcfile to point to library install location (LP: #564506)
@@ -371,6 +395,14 @@ indicator-application (0.0.3-0ubuntu1) lucid; urgency=low
-- Ted Gould <ted@ubuntu.com> Thu, 10 Dec 2009 13:34:40 -0600
+indicator-application (0.0.2-0ubuntu1~ppa1) karmic; urgency=low
+
+ * Upstream release 0.0.2
+ * Updates API to use GTK instead of dbusmenu to make it
+ easier for upstream developers to use.
+
+ -- Ted Gould <ted@ubuntu.com> Fri, 04 Dec 2009 14:50:45 -0600
+
indicator-application (0.0.2-0~ppa3) karmic; urgency=low
* debian/watch:
@@ -380,14 +412,6 @@ indicator-application (0.0.2-0~ppa3) karmic; urgency=low
-- Ken VanDine <ken.vandine@canonical.com> Thu, 10 Dec 2009 09:00:06 -0500
-indicator-application (0.0.2-0ubuntu1~ppa1) karmic; urgency=low
-
- * Upstream release 0.0.2
- * Updates API to use GTK instead of dbusmenu to make it
- easier for upstream developers to use.
-
- -- Ted Gould <ted@ubuntu.com> Fri, 04 Dec 2009 14:50:45 -0600
-
indicator-application (0.0.1-0ubuntu3~ppa4) karmic; urgency=low
* Adding in copyright headers and licenses
diff --git a/docs/reference/libappindicator-docs.sgml b/docs/reference/libappindicator-docs.sgml
index 820fe2b..e6c3060 100644
--- a/docs/reference/libappindicator-docs.sgml
+++ b/docs/reference/libappindicator-docs.sgml
@@ -8,7 +8,7 @@
<bookinfo>
<title>libappindicator Reference Manual</title>
<releaseinfo>
- for libappindicator 0.0.19
+ for libappindicator 0.0.21
</releaseinfo>
</bookinfo>
diff --git a/docs/reference/version.xml b/docs/reference/version.xml
index 44517d5..236c7ad 100644
--- a/docs/reference/version.xml
+++ b/docs/reference/version.xml
@@ -1 +1 @@
-0.0.19
+0.0.21
diff --git a/gtk-doc.make b/gtk-doc.make
index 0f87cc7..63adaed 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -5,13 +5,13 @@
####################################
if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
GTKDOC_RUN = $(LIBTOOL) --mode=execute
else
GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN = sh -c
+GTKDOC_RUN =
endif
# We set GPATH here; this gives us semantics for GNU make
@@ -31,7 +31,9 @@ EXTRA_DIST = \
$(DOC_MODULE)-overrides.txt
DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+ pdf-build.stamp \
+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
+ $(srcdir)/pdf.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
@@ -48,12 +50,23 @@ REPORT_FILES = \
CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
if ENABLE_GTK_DOC
-all-local: html-build.stamp
+if GTK_DOC_BUILD_HTML
+HTML_BUILD_STAMP=html-build.stamp
+else
+HTML_BUILD_STAMP=
+endif
+if GTK_DOC_BUILD_PDF
+PDF_BUILD_STAMP=pdf-build.stamp
+else
+PDF_BUILD_STAMP=
+endif
+
+all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
else
all-local:
endif
-docs: html-build.stamp
+docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
$(REPORT_FILES): sgml-build.stamp
@@ -62,9 +75,9 @@ $(REPORT_FILES): sgml-build.stamp
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
@echo 'gtk-doc: Scanning header files'
@-chmod -R u+w $(srcdir)
- cd $(srcdir) && \
+ @cd $(srcdir) && \
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
- if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+ @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
else \
cd $(srcdir) ; \
@@ -72,7 +85,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
test -f $$i || touch $$i ; \
done \
fi
- touch scan-build.stamp
+ @touch scan-build.stamp
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
@true
@@ -82,24 +95,23 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
@echo 'gtk-doc: Rebuilding template files'
@-chmod -R u+w $(srcdir)
- cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
- touch tmpl-build.stamp
+ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+ @touch tmpl-build.stamp
tmpl.stamp: tmpl-build.stamp
@true
-tmpl/*.sgml:
+$(srcdir)/tmpl/*.sgml:
@true
-
#### xml ####
-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
@echo 'gtk-doc: Building XML'
@-chmod -R u+w $(srcdir)
- cd $(srcdir) && \
+ @cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
- touch sgml-build.stamp
+ @touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
@true
@@ -109,18 +121,37 @@ sgml.stamp: sgml-build.stamp
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo 'gtk-doc: Building HTML'
@-chmod -R u+w $(srcdir)
- rm -rf $(srcdir)/html
- mkdir $(srcdir)/html
- mkhtml_options=""; \
+ @rm -rf $(srcdir)/html
+ @mkdir $(srcdir)/html
+ @mkhtml_options=""; \
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
if test "$(?)" = "0"; then \
mkhtml_options=--path="$(srcdir)"; \
- fi
- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ fi; \
+ cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
@echo 'gtk-doc: Fixing cross-references'
- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
- touch html-build.stamp
+ @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ @touch html-build.stamp
+
+#### pdf ####
+
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ @echo 'gtk-doc: Building PDF'
+ @-chmod -R u+w $(srcdir)
+ @rm -rf $(srcdir)/$(DOC_MODULE).pdf
+ @mkpdf_imgdirs=""; \
+ if test "x$(HTML_IMAGES)" != "x"; then \
+ for img in $(HTML_IMAGES); do \
+ part=`dirname $$img`; \
+ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+ if test $$? != 0; then \
+ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+ fi; \
+ done; \
+ fi; \
+ cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+ @touch pdf-build.stamp
##############
@@ -130,14 +161,14 @@ clean-local:
distclean-local:
cd $(srcdir) && \
- rm -rf xml $(REPORT_FILES) \
+ rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
$(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
maintainer-clean-local: clean
cd $(srcdir) && rm -rf xml html
install-data-local:
- installfiles=`echo $(srcdir)/html/*`; \
+ @installfiles=`echo $(srcdir)/html/*`; \
if test "$$installfiles" = '$(srcdir)/html/*'; \
then echo '-- Nothing to install' ; \
else \
@@ -157,12 +188,11 @@ install-data-local:
mv -f $${installdir}/$(DOC_MODULE).devhelp \
$${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
fi; \
- ! which gtkdoc-rebase >/dev/null 2>&1 || \
- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
+ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
fi
uninstall-local:
- if test -n "$(DOC_MODULE_VERSION)"; then \
+ @if test -n "$(DOC_MODULE_VERSION)"; then \
installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
else \
installdir="$(DESTDIR)$(TARGET_DIR)"; \
@@ -182,15 +212,13 @@ endif
dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/tmpl
- mkdir $(distdir)/xml
mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
- -cp $(srcdir)/xml/*.xml $(distdir)/xml
cp $(srcdir)/html/* $(distdir)/html
+ -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
cd $(distdir) && rm -f $(DISTCLEANFILES)
- ! which gtkdoc-rebase >/dev/null 2>&1 || \
- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
.PHONY : dist-hook-local docs
diff --git a/src/Makefile.in b/src/Makefile.in
index b8a80fc..e760360 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -368,7 +368,8 @@ libapplication_la_CFLAGS = $(INDICATOR_CFLAGS) \
-Wl,-Bsymbolic-functions \
-Wl,-z,defs \
-Wl,--as-needed \
- -Werror
+ -Werror \
+ -DG_LOG_DOMAIN=\"Indicator-Application\"
libapplication_la_LIBADD = $(INDICATOR_LIBS)
libapplication_la_LDFLAGS = -module -avoid-version
@@ -390,7 +391,8 @@ indicator_application_service_SOURCES = \
indicator_application_service_CFLAGS = \
$(INDICATOR_CFLAGS) \
- -Wall -Werror
+ -Wall -Werror \
+ -DG_LOG_DOMAIN=\"indicator-application-service\"
indicator_application_service_LDADD = \
$(INDICATOR_LIBS)
@@ -431,7 +433,8 @@ libappindicator_la_LDFLAGS = \
libappindicator_la_CFLAGS = \
$(INDICATOR_CFLAGS) \
- -Wall -Werror
+ -Wall -Werror \
+ -DG_LOG_DOMAIN=\"libappindicator\"
libappindicator_la_LIBADD = \
$(INDICATOR_LIBS)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 16:24:07 +0000