diff options
author | Ted Gould <ted@gould.cx> | 2011-02-10 22:25:25 -0600 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2011-02-10 22:25:25 -0600 |
commit | 3d4fdfb100856205654c8926600207b01820391b (patch) | |
tree | 4d3c49cfd6d2c58aaec02ae636f619c695cfd504 /src/Makefile.am | |
parent | ac68d851252a8f3e76b294488676477aa5e4ba83 (diff) | |
parent | 596f48a0a0c29e683fb31bc837ff54b1b8ca7343 (diff) | |
download | libayatana-appindicator-3d4fdfb100856205654c8926600207b01820391b.tar.gz libayatana-appindicator-3d4fdfb100856205654c8926600207b01820391b.tar.bz2 libayatana-appindicator-3d4fdfb100856205654c8926600207b01820391b.zip |
New upstream release (0.2.95)
∘ Fixing build for GTK2/3 dual build
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 10 |
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 |