diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2017-06-27 19:11:56 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2017-06-28 11:53:54 +0200 |
| commit | 0348492f4d81675127067c8725014e139263412a (patch) | |
| tree | b1afa2b4464224d786bed8e32db1659e4ff7fd41 /src/libtracker-sparql | |
| parent | 0da7438e25d761a673025d509890847908c647a2 (diff) | |
| download | tracker-0348492f4d81675127067c8725014e139263412a.tar.gz | |
autotools: Build and merge C/Vala girs in libtracker-sparql
Following the meson changes, build 2 separate static libs, generate
introspection stuff for those, and put them together in
src/libtracker-sparql-backend.
https://bugzilla.gnome.org/show_bug.cgi?id=782091
Diffstat (limited to 'src/libtracker-sparql')
| -rw-r--r-- | src/libtracker-sparql/Makefile.am | 42 |
1 files changed, 13 insertions, 29 deletions
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am index 85b189c61..192d98e38 100644 --- a/src/libtracker-sparql/Makefile.am +++ b/src/libtracker-sparql/Makefile.am @@ -1,7 +1,7 @@ -noinst_LTLIBRARIES = libtracker-sparql.la +noinst_LTLIBRARIES = libtracker-sparql-intermediate-vala.la libtracker-sparql-intermediate-c.la -libtracker_sparql_la_VALAFLAGS = \ - --gir Tracker-$(TRACKER_API_VERSION).gir \ +libtracker_sparql_intermediate_vala_la_VALAFLAGS = \ + --gir Tracker_Vala-$(TRACKER_API_VERSION).gir \ --library tracker-sparql-$(TRACKER_API_VERSION) \ --includedir=libtracker-sparql \ --header $(vala_header:.h=-no-checks.h) \ @@ -27,28 +27,31 @@ ENUM_SOURCES = \ tracker-sparql-enum-types.c \ tracker-sparql-enum-types.h -libtracker_sparql_la_SOURCES = \ - $(ENUM_SOURCES) \ +libtracker_sparql_intermediate_vala_la_SOURCES = \ tracker-namespace.vala \ tracker-builder.vala \ tracker-connection.vala \ tracker-cursor.vala \ + tracker-utils.vala + +libtracker_sparql_intermediate_vala_la_LIBADD = \ + $(BUILD_LIBS) \ + $(LIBTRACKER_SPARQL_LIBS) + +libtracker_sparql_intermediate_c_la_SOURCES = \ + $(ENUM_SOURCES) \ tracker-namespace-manager.c \ tracker-namespace-manager.h \ tracker-notifier.c \ tracker-notifier.h \ tracker-resource.c \ tracker-resource.h \ - tracker-utils.vala \ tracker-uri.c \ tracker-uri.h \ tracker-ontologies.h \ tracker-version.c \ tracker-version.h -libtracker_sparql_la_LIBADD = \ - $(BUILD_LIBS) \ - $(LIBTRACKER_SPARQL_LIBS) # Should only be one file vala_header = tracker-generated.h @@ -94,7 +97,7 @@ vapi_DATA = \ tracker-sparql-$(TRACKER_API_VERSION).deps BUILT_SOURCES = \ - libtracker_sparql_la_vala.stamp + libtracker_sparql_intermediate_vala_la_vala.stamp MAINTAINERCLEANFILES = \ tracker-sparql-$(TRACKER_API_VERSION).vapi \ @@ -111,22 +114,3 @@ EXTRA_DIST = \ $(vala_header:.h=-no-checks.h) \ tracker-sparql-add-include-guards.sh \ meson.build - -# Introspection foo --include $(INTROSPECTION_MAKEFILE) - -if HAVE_INTROSPECTION -Tracker-@TRACKER_API_VERSION@.typelib: Tracker-$(TRACKER_API_VERSION).gir - @INTROSPECTION_COMPILER@ --shared-library=libtracker-sparql-@TRACKER_API_VERSION@.so.0 -o $@ $^ - -girdir = $(datadir)/gir-1.0 -gir_DATA = Tracker-$(TRACKER_API_VERSION).gir - -typelibdir = $(libdir)/girepository-1.0 -typelib_DATA = $(gir_DATA:.gir=.typelib) - -# We don't clean the gir/typelib data for *Vala* generated g-ir files. -# However, we do for *C* generated g-ir files due to Vala not being -# required when building from a tarball. -DISTCLEANFILES = $(gir_DATA) $(typelib_DATA) -endif |