aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-02-10 22:04:25 -0600
committerTed Gould <ted@gould.cx>2011-02-10 22:04:25 -0600
commit61a686f2933c677574c17d40b651cd3b5bfba899 (patch)
tree670e5f4dabc0ae1ff49bb463b38aa37f35ccbc9f /src
parent725a13ee3f5a4f51714f341a9c503cc181b21f61 (diff)
downloadlibayatana-appindicator-61a686f2933c677574c17d40b651cd3b5bfba899.tar.gz
libayatana-appindicator-61a686f2933c677574c17d40b651cd3b5bfba899.tar.bz2
libayatana-appindicator-61a686f2933c677574c17d40b651cd3b5bfba899.zip
Changing the install path of the headers for libappindicator GTK3 version so it's parrallel installable
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am7
-rw-r--r--src/appindicator3-0.1.pc.in2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 546971f..8a74d66 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,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
@@ -135,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) \
@@ -157,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
diff --git a/src/appindicator3-0.1.pc.in b/src/appindicator3-0.1.pc.in
index 0ffe409..f59ac70 100644
--- a/src/appindicator3-0.1.pc.in
+++ b/src/appindicator3-0.1.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
bindir=@bindir@
includedir=@includedir@
-Cflags: -I${includedir}/libappindicator-0.1
+Cflags: -I${includedir}/libappindicator3-0.1
Requires: dbusmenu-glib-0.4 gtk+-3.0
Libs: -L${libdir} -lappindicator3