diff options
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 179 |
1 files changed, 3 insertions, 176 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ae1de3e4..17c22f22 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,10 +1,8 @@ -INCLUDES = \ +AM_CPPFLAGS = \ $(TELEPATHY_CFLAGS) \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ $(NETWORK_MANAGER_CFLAGS) \ - $(CONNMAN_CFLAGS) \ - $(UPOWER_GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\"mcd\" \ -DMCD_PLUGIN_LOADER_DIR=\"@libdir@/mission-control-plugins.@MCP_ABI_VERSION@\" \ -DMC_DISABLE_DEPRECATED -I$(top_srcdir) @@ -13,7 +11,6 @@ AM_CFLAGS = $(ERROR_CFLAGS) mc_headers = \ mcd-account.h \ - mcd-account-conditions.h \ mcd-account-manager.h \ mcd-account-manager-default.h \ mcd-debug.h \ @@ -28,58 +25,17 @@ mc_headers = \ mcd-service.h \ mcd-storage.h -if ENABLE_LIBACCOUNTS_SSO -mc_headers += \ - mcd-account-manager-sso.h \ - $(NULL) - -if ENABLE_LIBACCOUNTS_GLIB_HIDDEN -mc_headers += \ - mcd-storage-ag-hidden.h \ - $(NULL) -endif - -endif - -mc_gen_headers = \ - _gen/cli-Connection_Manager_Interface_Account_Storage.h \ - _gen/enums.h \ - _gen/gtypes.h \ - _gen/interfaces.h \ - _gen/svc-Account_Interface_Conditions.h \ - _gen/svc-Account_Interface_External_Password_Storage.h \ - _gen/svc-Account_Interface_Hidden.h \ - _gen/svc-Account_Manager_Interface_Hidden.h \ - _gen/svc-dispatcher.h - nodist_libmcd_convenience_la_SOURCES = \ - _gen/cli-Connection_Manager_Interface_Account_Storage-body.h \ - _gen/gtypes-body.h \ - _gen/interfaces-body.h \ - _gen/register-dbus-glib-marshallers-body.h \ - _gen/svc-Account_Interface_Conditions.c \ - _gen/svc-Account_Interface_External_Password_Storage.c \ - _gen/svc-Account_Interface_Hidden.c \ - _gen/svc-Account_Manager_Interface_Hidden.c \ - _gen/svc-dispatcher.c \ mcd-enum-types.c \ mcd-enum-types.h \ - $(mc_gen_headers) + $(NULL) BUILT_SOURCES = \ - _gen/mcd.xml \ stamp-mcd-enum-types.h \ $(nodist_libmcd_convenience_la_SOURCES) CLEANFILES = \ $(BUILT_SOURCES) \ - _gen/cli-Connection_Manager_Interface_Account_Storage-gtk-doc.h \ - _gen/svc-dispatcher-gtk-doc.h \ - _gen/svc-Account_Interface_Hidden-gtk-doc.h \ - _gen/svc-Account_Interface_External_Password_Storage-gtk-doc.h \ - _gen/svc-Account_Interface_Conditions-gtk-doc.h \ - _gen/svc-Account_Manager_Interface_Hidden-gtk-doc.h \ - _gen/gtypes-gtk-doc.h \ $(NULL) libmcd_convenience_la_LIBADD = \ @@ -88,27 +44,14 @@ libmcd_convenience_la_LIBADD = \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ $(NETWORK_MANAGER_LIBS) \ - $(CONNMAN_LIBS) \ - $(UPOWER_GLIB_LIBS) \ $(NULL) -if ENABLE_LIBACCOUNTS_SSO -libmcd_convenience_la_LIBADD += $(LIBACCOUNTS_SSO_LIBS) -INCLUDES += $(LIBACCOUNTS_SSO_CFLAGS) -endif - -if ENABLE_AEGIS -libmcd_convenience_la_LIBADD += $(top_builddir)/plugins/libmcp-aegis.la -endif - noinst_LTLIBRARIES = libmcd-convenience.la libmcd_convenience_la_SOURCES = \ mcd-account.c \ mcd-account-addressing.h \ - mcd-account-conditions.c \ mcd-account-config.h \ - mcd-account-connection.c \ mcd-account-requests.c \ mcd-account-addressing.c \ mcd-account-manager.c \ @@ -123,7 +66,6 @@ libmcd_convenience_la_SOURCES = \ client-registry.h \ connectivity-monitor.c \ connectivity-monitor.h \ - gtypes.c \ mcd-dbusprop.c \ mcd-dbusprop.h \ mcd-debug.c \ @@ -163,19 +105,6 @@ libmcd_convenience_la_SOURCES = \ sp_timestamp.h \ $(mc_headers) -if ENABLE_LIBACCOUNTS_SSO -libmcd_convenience_la_SOURCES += \ - mcd-account-manager-sso.c \ - $(NULL) - -if ENABLE_LIBACCOUNTS_GLIB_HIDDEN -libmcd_convenience_la_SOURCES += \ - mcd-storage-ag-hidden.c \ - $(NULL) -endif - -endif - mcd-enum-types.h: stamp-mcd-enum-types.h $(AM_V_GEN)true stamp-mcd-enum-types.h: Makefile $(mc_headers) mcd-enum-types.c @@ -202,8 +131,6 @@ mcd-enum-types.c: Makefile $(mc_headers) && rm -f xgen-getc EXTRA_DIST = \ - mcd.xml \ - dispatcher.xml \ stamp-mcd-enum-types.h Android.mk: Makefile.am $(nodist_libmcd_convenience_la_SOURCES) @@ -212,111 +139,11 @@ Android.mk: Makefile.am $(nodist_libmcd_convenience_la_SOURCES) -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -:SOURCES $(libmcd_convenience_la_SOURCES) $(nodist_libmcd_convenience_la_SOURCES) \ - -:CFLAGS $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) $(CFLAGS) $(AM_CFLAGS) \ + -:CFLAGS $(DEFAULT_INCLUDES) $(DEFS) $(CFLAGS) $(AM_CFLAGS) \ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \ -:LDFLAGS $(libmcd_convenience_la_LIBADD) \ > $@ -# ---- telepathy-glib-style code generation ---- - -tools_dir = $(top_srcdir)/tools - -_gen/mcd.xml: mcd.xml $(wildcard $(top_srcdir)/xml/*.xml) - $(AM_V_at)$(mkdir_p) _gen - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ - $< > $@ - -_gen/%.xml: $(top_srcdir)/xml/%.xml $(wildcard $(top_srcdir)/xml/*.xml) - $(AM_V_at)$(mkdir_p) _gen - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ - $< > $@ - -# Generated files which can be done for all "classes" at once - -_gen/register-dbus-glib-marshallers-body.h: _gen/mcd.xml \ - $(tools_dir)/glib-client-marshaller-gen.py Makefile.am - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \ - _mcd_ext > $@ - -_gen/enums.h: _gen/mcd.xml $(tools_dir)/c-constants-generator.xsl - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \ - --stringparam mixed-case-prefix mc \ - $(tools_dir)/c-constants-generator.xsl \ - $< > $@ - -_gen/interfaces.h: _gen/mcd.xml \ - $(tools_dir)/glib-interfaces-generator.xsl \ - $(tools_dir)/c-interfaces-generator.xsl - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \ - --stringparam mixed-case-prefix mc \ - $(tools_dir)/glib-interfaces-generator.xsl \ - $< > $@ - -_gen/interfaces-body.h: _gen/mcd.xml \ - $(tools_dir)/glib-interfaces-body-generator.xsl \ - $(tools_dir)/c-interfaces-generator.xsl - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \ - --stringparam mixed-case-prefix mc \ - $(tools_dir)/glib-interfaces-body-generator.xsl \ - $< > $@ - -_gen/gtypes.h: _gen/gtypes-gtk-doc.h - @: # generated as a side-effect - -_gen/gtypes-body.h: _gen/gtypes-gtk-doc.h - @: # generated as a side-effect - -_gen/gtypes-gtk-doc.h: _gen/mcd.xml \ - $(top_srcdir)/tools/glib-gtypes-generator.py - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \ - $< _gen/gtypes mc - - - -# Generated files which must be generated per "class". -# (Currently the only "class" is nmc4, but the new API will need "classes" -# like account, account-manager, ...) - -_gen/%.xml: $(top_srcdir)/xml/%.xml $(wildcard $(top_srcdir)/xml/*.xml) Makefile.am - $(AM_V_at)$(mkdir_p) _gen - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ - $< > $@ - -_gen/%.xml: %.xml $(wildcard $(top_srcdir)/xml/*.xml) Makefile.am - $(AM_V_at)$(mkdir_p) _gen - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ - $< > $@ - -_gen/cli-%-body.h: _gen/cli-%-gtk-doc.h - @: # generated as a side-effect - -_gen/cli-%.h: _gen/cli-%-gtk-doc.h - @: # generated as a side-effect - -_gen/cli-%-gtk-doc.h: _gen/%.xml \ - $(tools_dir)/glib-client-gen.py Makefile.am - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \ - --group=`echo $* | tr x- x_` \ - --iface-quark-prefix=MC_IFACE_QUARK \ - --tp-proxy-api=0.7.6 \ - $< Mc_Cli _gen/cli-$* - -_gen/svc-%.c: _gen/svc-%-gtk-doc.h - @: # generated as a side-effect - -_gen/svc-%.h: _gen/svc-%-gtk-doc.h - @: # generated as a side-effect - -_gen/svc-%-gtk-doc.h: _gen/%.xml \ - $(tools_dir)/glib-ginterface-gen.py Makefile.am - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ - --filename=_gen/svc-$* \ - --signal-marshal-prefix=_mcd_ext \ - --include='<telepathy-glib/telepathy-glib.h>' \ - --not-implemented-func='tp_dbus_g_method_return_not_implemented' \ - --allow-unstable \ - $< Mc_Svc_ - include ../tools/header-checks.am check-local: header-decl-macro-check |