aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorLuke Yelavich <luke.yelavich@canonical.com>2011-02-14 13:24:18 +1100
committerLuke Yelavich <luke.yelavich@canonical.com>2011-02-14 13:24:18 +1100
commit5824bcdd09bc63f62ecc9856d8e10115df73a863 (patch)
tree50838df753123fd5f87402693d9d5db50de2cf61 /src/Makefile.am
parentb63c137778bbec1fb010f095e08750817744fced (diff)
parent1c384cdf7e601e3786fc1add31d157c0eafa1539 (diff)
downloadlibayatana-appindicator-5824bcdd09bc63f62ecc9856d8e10115df73a863.tar.gz
libayatana-appindicator-5824bcdd09bc63f62ecc9856d8e10115df73a863.tar.bz2
libayatana-appindicator-5824bcdd09bc63f62ecc9856d8e10115df73a863.zip
Merge from trunk
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index f83a6c4..8a74d66 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,8 @@ BUILT_SOURCES =
EXTRA_DIST = \
appindicator-0.1.pc.in \
appindicator3-0.1.pc.in \
- AppIndicator$(VER)-0.1.metadata.in
+ AppIndicator-0.1.metadata.in \
+ AppIndicator3-0.1.metadata.in
include $(top_srcdir)/Makefile.am.enum
include $(top_srcdir)/Makefile.am.marshal
@@ -44,7 +45,7 @@ glib_enum_headers = $(addprefix $(srcdir)/, $(libappindicator_headers))
DISTCLEANFILES += app-indicator-enum-types.c
libappindicatorincludefolder=libappindicator
-libappindicatorincludedir=$(includedir)/libappindicator-0.1/$(libappindicatorincludefolder)
+libappindicatorincludedir=$(includedir)/libappindicator$(VER)-0.1/$(libappindicatorincludefolder)
libappindicator_headers = \
app-indicator.h
@@ -134,7 +135,8 @@ INTROSPECTION_SCANNER_ARGS = \
--add-include-path=$(srcdir) \
$(addprefix --c-include=$(libappindicatorincludefolder)/, $(libappindicator_headers)) \
--symbol-prefix=app \
- --identifier-prefix=App
+ --identifier-prefix=App \
+ --warn-all
else
INTROSPECTION_SCANNER_ARGS = \
--add-include-path=$(srcdir) \
@@ -156,11 +158,13 @@ AppIndicator_0_1_gir_INCLUDES = \
AppIndicator_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
AppIndicator_0_1_gir_LIBS = libappindicator$(VER).la
AppIndicator_0_1_gir_FILES = $(introspection_sources)
+# AppIndicator_0_1_gir_NAMESPACE = AppIndicator
AppIndicator3_0_1_gir_INCLUDES = $(AppIndicator_0_1_gir_INCLUDES)
AppIndicator3_0_1_gir_CFLAGS = $(AppIndicator_0_1_gir_CFLAGS)
AppIndicator3_0_1_gir_LIBS = $(AppIndicator_0_1_gir_LIBS)
AppIndicator3_0_1_gir_FILES = $(AppIndicator_0_1_gir_FILES)
+# AppIndicator3_0_1_gir_NAMESPACE = AppIndicator
INTROSPECTION_GIRS += AppIndicator$(VER)-0.1.gir