diff options
author | Ted Gould <ted@gould.cx> | 2011-02-10 14:57:31 -0600 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2011-02-10 14:57:31 -0600 |
commit | a9814d5d7acde62dd8f5cf3424f795bb4c977dd1 (patch) | |
tree | 11f2e90896af12c6718eb4b408347bb22b643672 /src/Makefile.in | |
parent | 6def775bc45fdcf7ce59ccd08dd89c751b5cf3d3 (diff) | |
parent | 18d89929cb035b798916e10a6aa253fd5bcf4e7d (diff) | |
download | libayatana-appindicator-a9814d5d7acde62dd8f5cf3424f795bb4c977dd1.tar.gz libayatana-appindicator-a9814d5d7acde62dd8f5cf3424f795bb4c977dd1.tar.bz2 libayatana-appindicator-a9814d5d7acde62dd8f5cf3424f795bb4c977dd1.zip |
New upstream release.
∘ Fix Vala bindings
∘ Add support for scroll events
Diffstat (limited to 'src/Makefile.in')
-rw-r--r-- | src/Makefile.in | 81 |
1 files changed, 25 insertions, 56 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index b455f74..c7b33d1 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -76,8 +76,10 @@ DIST_COMMON = $(libappindicator3include_HEADERS) \ $(top_srcdir)/Makefile.am.enum \ $(top_srcdir)/Makefile.am.marshal @HAVE_INTROSPECTION_TRUE@am__append_1 = AppIndicator$(VER)-0.1.gir -@HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA) \ -@HAVE_INTROSPECTION_TRUE@ $(vapi_DATA) +@HAVE_INTROSPECTION_TRUE@am__append_2 = AppIndicator$(VER)-0.1.metadata +@HAVE_INTROSPECTION_TRUE@am__append_3 = \ +@HAVE_INTROSPECTION_TRUE@ AppIndicator$(VER)-0.1.metadata \ +@HAVE_INTROSPECTION_TRUE@ $(gir_DATA) $(typelib_DATA) subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ @@ -114,7 +116,6 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" \ - "$(DESTDIR)$(vapidir)" \ "$(DESTDIR)$(libappindicator3includedir)" \ "$(DESTDIR)$(libappindicatorincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -182,7 +183,7 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libappindicator_la_SOURCES) $(libappindicator3_la_SOURCES) DIST_SOURCES = $(libappindicator_la_SOURCES) \ $(libappindicator3_la_SOURCES) -DATA = $(gir_DATA) $(pkgconfig_DATA) $(typelib_DATA) $(vapi_DATA) +DATA = $(gir_DATA) $(pkgconfig_DATA) $(typelib_DATA) HEADERS = $(libappindicator3include_HEADERS) \ $(libappindicatorinclude_HEADERS) ETAGS = etags @@ -297,6 +298,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@ TESTDEPS_LIBS = @TESTDEPS_LIBS@ +VALAC = @VALAC@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ @@ -361,12 +363,10 @@ top_srcdir = @top_srcdir@ @USE_GTK3_TRUE@lib_LTLIBRARIES = libappindicator3.la @USE_GTK3_FALSE@GTKGIR = Gtk-2.0 @USE_GTK3_TRUE@GTKGIR = Gtk-3.0 -@USE_GTK3_FALSE@GTKVAPI = gtk+-2.0 -@USE_GTK3_TRUE@GTKVAPI = gtk+-3.0 CLEANFILES = stamp-enum-types stamp-marshal \ gen-notification-item.xml.c gen-notification-item.xml.h \ gen-notification-watcher.xml.c gen-notification-watcher.xml.h \ - $(am__append_2) + $(am__append_3) DISTCLEANFILES = $(glib_enum_h) $(glib_enum_c) $(marshal_h) \ $(marshal_c) app-indicator-enum-types.c @@ -377,10 +377,10 @@ BUILT_SOURCES = $(glib_enum_h) $(glib_enum_c) $(marshal_h) \ $(marshal_c) application-service-marshal.h \ application-service-marshal.c gen-notification-item.xml.c \ gen-notification-item.xml.h gen-notification-watcher.xml.c \ - gen-notification-watcher.xml.h + gen-notification-watcher.xml.h $(am__append_2) EXTRA_DIST = appindicator-0.1.pc.in appindicator3-0.1.pc.in \ - AppIndicator-0.1.metadata $(enum_tmpl_h) $(enum_tmpl_c) \ - $(glib_marshal_list) $(DBUS_SPECS) + AppIndicator$(VER)-0.1.metadata.in $(enum_tmpl_h) \ + $(enum_tmpl_c) $(glib_marshal_list) $(DBUS_SPECS) enum_tmpl_h = $(glib_enum_h:.h=.h.in) enum_tmpl_c = $(glib_enum_c:.c=.c.in) marshal_h = $(glib_marshal_list:.list=.h) @@ -396,7 +396,8 @@ pkgconfigdir = $(libdir)/pkgconfig glib_enum_h = app-indicator-enum-types.h glib_enum_c = app-indicator-enum-types.c glib_enum_headers = $(addprefix $(srcdir)/, $(libappindicator_headers)) -libappindicatorincludedir = $(includedir)/libappindicator-0.1/libappindicator +libappindicatorincludefolder = libappindicator +libappindicatorincludedir = $(includedir)/libappindicator-0.1/$(libappindicatorincludefolder) libappindicator_headers = \ app-indicator.h @@ -452,11 +453,11 @@ DBUS_SPECS = \ INTROSPECTION_GIRS = $(am__append_1) @INTROSPECTION_TEN_FALSE@INTROSPECTION_SCANNER_ARGS = \ @INTROSPECTION_TEN_FALSE@ --add-include-path=$(srcdir) \ -@INTROSPECTION_TEN_FALSE@ $(addprefix --c-include=src/, $(introspection_sources)) +@INTROSPECTION_TEN_FALSE@ $(addprefix --c-include=$(libappindicatorincludefolder)/, $(libappindicator_headers)) @INTROSPECTION_TEN_TRUE@INTROSPECTION_SCANNER_ARGS = \ @INTROSPECTION_TEN_TRUE@ --add-include-path=$(srcdir) \ -@INTROSPECTION_TEN_TRUE@ $(addprefix --c-include=src/, $(introspection_sources)) \ +@INTROSPECTION_TEN_TRUE@ $(addprefix --c-include=$(libappindicatorincludefolder)/, $(libappindicator_headers)) \ @INTROSPECTION_TEN_TRUE@ --symbol-prefix=app \ @INTROSPECTION_TEN_TRUE@ --identifier-prefix=App @@ -479,12 +480,6 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS) @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0 @HAVE_INTROSPECTION_TRUE@typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -######################### -# VAPI Files -######################### -@HAVE_INTROSPECTION_TRUE@vapidir = $(datadir)/vala/vapi -@HAVE_INTROSPECTION_TRUE@vapi_DATA = AppIndicator$(VER)-0.1.vapi all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -764,26 +759,6 @@ uninstall-typelibDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(typelibdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(typelibdir)" && rm -f $$files -install-vapiDATA: $(vapi_DATA) - @$(NORMAL_INSTALL) - test -z "$(vapidir)" || $(MKDIR_P) "$(DESTDIR)$(vapidir)" - @list='$(vapi_DATA)'; test -n "$(vapidir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(vapidir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(vapidir)" || exit $$?; \ - done - -uninstall-vapiDATA: - @$(NORMAL_UNINSTALL) - @list='$(vapi_DATA)'; test -n "$(vapidir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(vapidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(vapidir)" && rm -f $$files install-libappindicator3includeHEADERS: $(libappindicator3include_HEADERS) @$(NORMAL_INSTALL) test -z "$(libappindicator3includedir)" || $(MKDIR_P) "$(DESTDIR)$(libappindicator3includedir)" @@ -912,7 +887,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(libappindicator3includedir)" "$(DESTDIR)$(libappindicatorincludedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(libappindicator3includedir)" "$(DESTDIR)$(libappindicatorincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -970,7 +945,7 @@ info-am: install-data-am: install-girDATA \ install-libappindicator3includeHEADERS \ install-libappindicatorincludeHEADERS install-pkgconfigDATA \ - install-typelibDATA install-vapiDATA + install-typelibDATA install-dvi: install-dvi-am @@ -1019,8 +994,7 @@ ps-am: uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ uninstall-libappindicator3includeHEADERS \ uninstall-libappindicatorincludeHEADERS \ - uninstall-pkgconfigDATA uninstall-typelibDATA \ - uninstall-vapiDATA + uninstall-pkgconfigDATA uninstall-typelibDATA .MAKE: all check install install-am install-strip @@ -1034,16 +1008,14 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ install-libLTLIBRARIES install-libappindicator3includeHEADERS \ install-libappindicatorincludeHEADERS install-man install-pdf \ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ - install-strip install-typelibDATA install-vapiDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-girDATA \ - uninstall-libLTLIBRARIES \ + install-strip install-typelibDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-girDATA uninstall-libLTLIBRARIES \ uninstall-libappindicator3includeHEADERS \ uninstall-libappindicatorincludeHEADERS \ - uninstall-pkgconfigDATA uninstall-typelibDATA \ - uninstall-vapiDATA + uninstall-pkgconfigDATA uninstall-typelibDATA stamp-enum-types: $(glib_enum_headers) @@ -1105,11 +1077,8 @@ gen-%.xml.c: %.xml @HAVE_INTROSPECTION_TRUE@AppIndicator$(VER)-0.1.gir: libappindicator$(VER).la -@HAVE_INTROSPECTION_TRUE@AppIndicator$(VER)-0.1.vapi: AppIndicator$(VER)-0.1.gir Makefile.am -@HAVE_INTROSPECTION_TRUE@ $(VALA_API_GEN) --library=AppIndicator$(VER)-0.1 \ -@HAVE_INTROSPECTION_TRUE@ --pkg $(GTKVAPI) \ -@HAVE_INTROSPECTION_TRUE@ --vapidir=$(top_builddir)/src \ -@HAVE_INTROSPECTION_TRUE@ $< +@HAVE_INTROSPECTION_TRUE@AppIndicator$(VER)-0.1.metadata: AppIndicator$(VER)-0.1.gir +@HAVE_INTROSPECTION_TRUE@ cp -f $(srcdir)/$@.in $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. |