From 5ec00d635ec4ee464961c7788a927aa908b7c4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= Date: Mon, 7 Aug 2017 12:14:45 +0200 Subject: build: Remove autotools To avoid the burden of maintaining multiple build systems, this patch removes autotools support. https://bugzilla.gnome.org/show_bug.cgi?id=784910 --- Makefile.am | 28 --------------- Makefile.gtester | 66 ---------------------------------- autogen.sh | 32 ----------------- bin/Makefile.am | 26 -------------- client/Makefile.am | 46 ------------------------ client/dconf.pc.in | 11 ------ common/Makefile.am | 23 ------------ configure.ac | 93 ------------------------------------------------ docs/Makefile.am | 51 --------------------------- engine/Makefile.am | 22 ------------ gdbus/Makefile.am | 23 ------------ gsettings/Makefile.am | 30 ---------------- gvdb/Makefile.am | 16 --------- service/Makefile.am | 44 ----------------------- shm/Makefile.am | 13 ------- tests/Makefile.am | 98 --------------------------------------------------- 16 files changed, 622 deletions(-) delete mode 100644 Makefile.am delete mode 100644 Makefile.gtester delete mode 100755 autogen.sh delete mode 100644 bin/Makefile.am delete mode 100644 client/Makefile.am delete mode 100644 client/dconf.pc.in delete mode 100644 common/Makefile.am delete mode 100644 configure.ac delete mode 100644 docs/Makefile.am delete mode 100644 engine/Makefile.am delete mode 100644 gdbus/Makefile.am delete mode 100644 gsettings/Makefile.am delete mode 100644 gvdb/Makefile.am delete mode 100644 service/Makefile.am delete mode 100644 shm/Makefile.am delete mode 100644 tests/Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 81a56bb..0000000 --- a/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -include Makefile.gtester - -ACLOCAL_AMFLAGS = -I m4 - -SUBDIRS = shm gvdb common engine service gdbus gsettings client bin docs tests - -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc -EXTRA_DIST = trim-lcov.py m4 meson.build meson_options.txt meson_post_install.py - -clean-am: lcov-clean gcno-clean - -.PHONY: lcov lcov-clean gcno-clean - -lcov: lcov-clean - $(MAKE) $(AM_MAKEFLAGS) check - lcov --directory $(top_builddir) --capture --test-name dconf | $(top_srcdir)/trim-lcov.py > dconf-lcov.info - LANG=C genhtml --prefix $(top_builddir) --output-directory lcov-html --legend --show-details dconf-lcov.info - @echo - @echo " file://$(abs_top_builddir)/lcov-html/index.html" - @echo - -gcno-clean: - -find . -name '*.gcno' -delete - -lcov-clean: - -lcov --directory $(top_builddir) -z - find . -name '*.gcda' -delete - rm -rf lcov-html dconf-lcov.info diff --git a/Makefile.gtester b/Makefile.gtester deleted file mode 100644 index fdc0010..0000000 --- a/Makefile.gtester +++ /dev/null @@ -1,66 +0,0 @@ -# initialize variables for unconditional += appending -TEST_PROGS = - -### testing rules - -# test: run all tests in cwd and subdirs -test: test-nonrecursive - @ for subdir in $(SUBDIRS) . ; do \ - test "$$subdir" = "." -o "$$subdir" = "po" || \ - ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ - done - -# test-nonrecursive: run tests only in cwd -test-nonrecursive: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || G_DEBUG=gc-friendly MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) gtester --verbose ${TEST_PROGS} - -# test-report: run tests in subdirs and generate report -# perf-report: run tests in subdirs with -m perf and generate report -# full-report: like test-report: with -m perf and -m slow -test-report perf-report full-report: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || { \ - case $@ in \ - test-report) test_options="-k";; \ - perf-report) test_options="-k -m=perf";; \ - full-report) test_options="-k -m=perf -m=slow";; \ - esac ; \ - if test -z "$$GTESTER_LOGDIR" ; then \ - gtester --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ - elif test -n "${TEST_PROGS}" ; then \ - gtester --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ - fi ; \ - } - @ ignore_logdir=true ; \ - if test -z "$$GTESTER_LOGDIR" ; then \ - GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \ - ignore_logdir=false ; \ - fi ; \ - if test -d "$(top_srcdir)/.git" ; then \ - REVISION=`git describe` ; \ - else \ - REVISION=$(VERSION) ; \ - fi ; \ - for subdir in $(SUBDIRS) . ; do \ - test "$$subdir" = "." -o "$$subdir" = "po" || \ - ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ - done ; \ - $$ignore_logdir || { \ - echo '' > $@.xml ; \ - echo '' >> $@.xml ; \ - echo '' >> $@.xml ; \ - echo ' $(PACKAGE)' >> $@.xml ; \ - echo ' $(VERSION)' >> $@.xml ; \ - echo " $$REVISION" >> $@.xml ; \ - echo '' >> $@.xml ; \ - for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \ - sed '1,1s/^?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \ - done ; \ - echo >> $@.xml ; \ - echo '' >> $@.xml ; \ - rm -rf "$$GTESTER_LOGDIR"/ ; \ - gtester-report --version 2>/dev/null 1>&2 ; test "$$?" != 0 || gtester-report $@.xml >$@.html ; \ - } -.PHONY: test test-report perf-report full-report test-nonrecursive - -# run tests in cwd as part of make check -check-local: test-nonrecursive diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 831054a..0000000 --- a/autogen.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -set -e - -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. - -olddir=`pwd` -cd "$srcdir" - -if automake-1.11 --version > /dev/null 2>&1; then - automake_suffix='-1.11' -else - automake_suffix='' -fi - -mkdir -p m4 build-aux -gtkdocize --docdir docs --flavour no-tmpl -aclocal${automake_suffix} -autoheader -automake${automake_suffix} --add-missing -autoconf - -CFLAGS=${CFLAGS=-ggdb} -LDFLAGS=${LDFLAGS=-Wl,-O1} -export CFLAGS LDFLAGS - -cd "$olddir" - -if test -z "$NOCONFIGURE"; then - "$srcdir"/configure "$@" -fi diff --git a/bin/Makefile.am b/bin/Makefile.am deleted file mode 100644 index 2196c75..0000000 --- a/bin/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -include $(top_srcdir)/Makefile.gtester - -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/client - -bin_PROGRAMS = dconf - -dconf_VALAFLAGS = --vapidir ../client --pkg=gio-2.0 --pkg=posix --pkg=dconf - -dconf_CFLAGS = \ - $(gio_CFLAGS) \ - -w - -dconf_LDADD = \ - ../client/libdconf.so.1 \ - $(gio_LIBS) - -dconf_SOURCES = \ - ../gvdb/gvdb-builder.c \ - gvdb.vapi \ - dconf-update.vala \ - dconf-dump.vala \ - dconf.vala - -completiondir = $(datadir)/bash-completion/completions -completion_DATA = completion/dconf -EXTRA_DIST = $(completion_DATA) meson.build diff --git a/client/Makefile.am b/client/Makefile.am deleted file mode 100644 index 45450f7..0000000 --- a/client/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -include $(top_srcdir)/Makefile.gtester - -shlibdir=$(libdir) -shlib_PROGRAMS = libdconf.so.1.0.0 -nodist_noinst_DATA = libdconf.so.1 libdconf.so -noinst_LIBRARIES = libdconf-client.a - -libdconf.so.1 libdconf.so: libdconf.so.1.0.0 - $(AM_V_GEN) ln -fs libdconf.so.1.0.0 $@ - -install-data-hook: - ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.1 - ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so - -uninstall-hook: - rm -f $(DESTDIR)$(shlibdir)/libdconf.so.1 - rm -f $(DESTDIR)$(shlibdir)/libdconf.so - -dconfinclude_HEADERS = dconf.h -dconfclientinclude_HEADERS = dconf-client.h -dconfclientincludedir = $(dconfincludedir)/client - -libdconf_client_a_CFLAGS = $(gio_CFLAGS) -DG_LOG_DOMAIN=\"dconf\" -libdconf_client_a_SOURCES = \ - dconf-client.c - -libdconf_so_1_0_0_CFLAGS = $(libdconf_client_a_CFLAGS) -fPIC -DPIC -libdconf_so_1_0_0_LDADD = \ - ../engine/libdconf-engine-shared.a \ - ../common/libdconf-common-shared.a \ - ../gdbus/libdconf-gdbus-thread-shared.a \ - ../gvdb/libgvdb-shared.a \ - ../shm/libdconf-shm-shared.a \ - $(gio_LIBS) -libdconf_so_1_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.1 -libdconf_so_1_0_0_SOURCES = $(libdconf_client_a_SOURCES) - -EXTRA_DIST = dconf.vapi dconf.deps meson.build - -vapi_DATA = dconf.vapi dconf.deps -vapidir = $(datadir)/vala/vapi - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = dconf.pc - -CLEANFILES = libdconf.so.1 libdconf.so diff --git a/client/dconf.pc.in b/client/dconf.pc.in deleted file mode 100644 index 652c6aa..0000000 --- a/client/dconf.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: dconf -Description: dconf client library -Version: @VERSION@ -Requires: gio-2.0 >= 2.25.7 -Libs: -L${libdir} -ldconf -Cflags: -I${includedir}/dconf diff --git a/common/Makefile.am b/common/Makefile.am deleted file mode 100644 index 4bb6f77..0000000 --- a/common/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -include $(top_srcdir)/Makefile.gtester - -dconfcommonincludedir = $(dconfincludedir)/common -dconfcommoninclude_HEADERS = \ - dconf-changeset.h \ - dconf-enums.h \ - dconf-paths.h - -noinst_LIBRARIES = libdconf-common.a libdconf-common-shared.a libdconf-common-hidden.a - -libdconf_common_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\" -libdconf_common_a_SOURCES = \ - dconf-changeset.c \ - dconf-error.c \ - dconf-paths.c - -libdconf_common_shared_a_CFLAGS = $(libdconf_common_a_CFLAGS) -fPIC -DPIC -libdconf_common_shared_a_SOURCES = $(libdconf_common_a_SOURCES) - -libdconf_common_hidden_a_CFLAGS = $(libdconf_common_a_CFLAGS) -fPIC -DPIC -fvisibility=hidden -libdconf_common_hidden_a_SOURCES = $(libdconf_common_a_SOURCES) - -EXTRA_DIST = meson.build diff --git a/configure.ac b/configure.ac deleted file mode 100644 index a467cf0..0000000 --- a/configure.ac +++ /dev/null @@ -1,93 +0,0 @@ -AC_INIT([dconf], - [0.26.1], - [https://bugzilla.gnome.org/enter_bug.cgi?product=dconf], - [dconf]) - -AC_CONFIG_SRCDIR([configure.ac]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_HEADERS([config.h]) - -AM_INIT_AUTOMAKE([1.11.2 foreign -Wno-portability no-dist-gzip dist-xz]) -AM_SILENT_RULES([yes]) - -# Set default CFLAGS before AC_PROG_CC does -if test "${CFLAGS+yes}" != "yes"; then - CFLAGS='-O2 -g -Wall -Wwrite-strings -Wmissing-prototypes -fno-common' -fi - -# Check for programs -AC_PROG_CC -AC_CHECK_LIB(c, dlsym, LIBDL="", [AC_CHECK_LIB(dl, dlsym, LIBDL="-ldl")]) -AC_SUBST(LIBDL) -AM_PROG_VALAC([0.18.0]) -AC_PROG_RANLIB -AC_ARG_ENABLE(man, - [AS_HELP_STRING([--enable-man], - [generate man pages [default=yes]])],, - enable_man=yes) - -AS_IF([test "$enable_man" != no], [ - AC_PATH_PROG([XSLTPROC], [xsltproc]) - AS_IF([test -z "$XSLTPROC"], [ - AC_MSG_ERROR([xsltproc is required for --enable-man]) - ]) -]) -AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no) - -# Use GLib resources -AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources) - -# Use GSettings -GLIB_GSETTINGS - -# Gtk-doc support -GTK_DOC_CHECK([1.15]) - -# Dependencies -PKG_CHECK_MODULES(glib, glib-2.0 >= 2.44.0) -PKG_CHECK_MODULES(gio, gio-unix-2.0) - -AC_ARG_WITH(gio_modules_dir, [ --with-gio-modules-dir=PATH choose directory for the GIO module, [default=LIBDIR/gio/modules]], giomodulesdir="$withval", giomodulesdir=${libdir}/gio/modules) -AC_SUBST(giomodulesdir) - -AC_ARG_WITH(dbus_service_dir, [ --with-dbus-service-dir=PATH choose directory for dbus service files, [default=PREFIX/share/dbus-1/services]], dbusservicedir="$withval", dbusservicedir=${datadir}/dbus-1/services) -AC_SUBST(dbusservicedir) - -AC_ARG_WITH(dbus_system_service_dir, [ --with-dbus-system-service-dir=PATH choose directory for dbus system service files, [default=PREFIX/share/dbus-1/system-services]], dbussystemservicedir="$withval", dbussystemservicedir=${datadir}/dbus-1/system-services) -AC_SUBST(dbussystemservicedir) - -AC_SUBST(dconfincludedir, ${includedir}/dconf) - -AC_PATH_PROG(gio_QUERYMODULES, gio-querymodules, no) - -AC_ARG_ENABLE(gcov, - AC_HELP_STRING([--enable-gcov], - [enable generation of code coverage information])) - -if test "x$enable_gcov" = "xyes"; then - CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage" - LDFLAGS="$LDFLAGS -lgcov" -fi - -dnl Gettext support -GETTEXT_PACKAGE=dconf -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used]) - -AC_CONFIG_FILES([ - common/Makefile - shm/Makefile - gvdb/Makefile - engine/Makefile - gdbus/Makefile - gsettings/Makefile - client/dconf.pc - client/Makefile - service/Makefile - bin/Makefile - tests/Makefile - docs/Makefile - Makefile -]) -AC_OUTPUT diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index 361beee..0000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -include $(top_srcdir)/Makefile.gtester - -include gtk-doc.make - -DOC_MODULE = dconf - -DOC_MAIN_SGML_FILE = dconf-docs.xml - -DOC_SOURCE_DIR = $(top_srcdir)/client $(top_srcdir)/common -HFILE_GLOB = $(top_srcdir)/client/*.h $(top_srcdir)/common/*.h -CFILE_GLOB = $(top_srcdir)/client/*.c $(top_srcdir)/common/*.c - -MKDB_OPTIONS = --output-format=xml - -AM_CPPFLAGS = $(gio_CFLAGS) -GTKDOC_LIBS = $(gio_LIBS) -L../client -ldconf -Wl,-rpath=../client - -content_files = \ - dconf-overview.xml \ - dconf-service.xml \ - dconf-tool.xml - -XSLTPROC_MAN_FLAGS = \ - --nonet \ - --stringparam man.output.quietly 1 \ - --stringparam funcsynopsis.style ansi \ - --stringparam man.th.extra1.suppress 1 \ - --stringparam man.authors.section.enabled 0 \ - --stringparam man.copyright.section.enabled 0 - -%.1: %.xml - $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< - -dconf.1: dconf-tool.xml - $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< - -dconf.7: dconf-overview.xml - $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< - -man_MANS = - -if ENABLE_MAN -man_MANS += \ - dconf-service.1 \ - dconf.1 \ - dconf.7 -endif - -EXTRA_DIST += dconf-service.xml dconf-tool.xml dconf-overview.xml meson.build - -DISTCLEANFILES = $(man_MANS) diff --git a/engine/Makefile.am b/engine/Makefile.am deleted file mode 100644 index 9f967de..0000000 --- a/engine/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -include $(top_srcdir)/Makefile.gtester - -noinst_LIBRARIES = libdconf-engine.a libdconf-engine-shared.a - -libdconf_engine_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\" -libdconf_engine_a_SOURCES = \ - dconf-engine-profile.h \ - dconf-engine-profile.c \ - dconf-engine-source-private.h \ - dconf-engine-source.h \ - dconf-engine-source-file.c \ - dconf-engine-source-user.c \ - dconf-engine-source-service.c \ - dconf-engine-source-system.c \ - dconf-engine-source.c \ - dconf-engine.h \ - dconf-engine.c - -libdconf_engine_shared_a_CFLAGS = $(libdconf_engine_a_CFLAGS) -fPIC -DPIC -libdconf_engine_shared_a_SOURCES = $(libdconf_engine_a_SOURCES) - -EXTRA_DIST = meson.build diff --git a/gdbus/Makefile.am b/gdbus/Makefile.am deleted file mode 100644 index 880bcb9..0000000 --- a/gdbus/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -include $(top_srcdir)/Makefile.gtester - -noinst_LIBRARIES = \ - libdconf-gdbus-thread.a \ - libdconf-gdbus-thread-shared.a \ - libdconf-gdbus-filter.a \ - libdconf-gdbus-filter-shared.a - -libdconf_gdbus_thread_a_CFLAGS = $(gio_CFLAGS) -DG_LOG_DOMAIN=\"dconf\" -libdconf_gdbus_thread_a_SOURCES = \ - dconf-gdbus-thread.c - -libdconf_gdbus_thread_shared_a_CFLAGS = $(libdconf_gdbus_thread_a_CFLAGS) -fPIC -DPIC -libdconf_gdbus_thread_shared_a_SOURCES = $(libdconf_gdbus_thread_a_SOURCES) - -libdconf_gdbus_filter_a_CFLAGS = $(gio_CFLAGS) -DG_LOG_DOMAIN=\"dconf\" -libdconf_gdbus_filter_a_SOURCES = \ - dconf-gdbus-filter.c - -libdconf_gdbus_filter_shared_a_CFLAGS = $(libdconf_gdbus_filter_a_CFLAGS) -fPIC -DPIC -libdconf_gdbus_filter_shared_a_SOURCES = $(libdconf_gdbus_filter_a_SOURCES) - -EXTRA_DIST = meson.build diff --git a/gsettings/Makefile.am b/gsettings/Makefile.am deleted file mode 100644 index 9a2ae8c..0000000 --- a/gsettings/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -include $(top_srcdir)/Makefile.gtester - -giomodules_PROGRAMS = libdconfsettings.so - -libdconfsettings_so_LDADD = \ - ../engine/libdconf-engine-shared.a \ - ../gvdb/libgvdb-shared.a \ - ../gdbus/libdconf-gdbus-thread-shared.a \ - ../common/libdconf-common-hidden.a \ - ../shm/libdconf-shm-shared.a \ - $(gio_LIBS) - -libdconfsettings_so_CFLAGS = $(gio_CFLAGS) -fPIC -DPIC -DG_LOG_DOMAIN=\"dconf\" -libdconfsettings_so_LDFLAGS = -shared -libdconfsettings_so_SOURCES = \ - dconfsettingsbackend.c - -uninstall-hook: - if test -z "$(DESTDIR)" -a "$(gio_QUERYMODULES)" != "no" ; then \ - $(gio_QUERYMODULES) $(giomodulesdir) ; \ - fi - -install-data-hook: - if test -z "$(DESTDIR)" -a "$(gio_QUERYMODULES)" != "no" ; then \ - $(gio_QUERYMODULES) $(giomodulesdir) ; \ - fi - -TESTS_ENVIRONMENT = export GSETTINGS_LIB=libdconfsettings.so; -TESTS = abicheck.sh -EXTRA_DIST = abicheck.sh meson.build diff --git a/gvdb/Makefile.am b/gvdb/Makefile.am deleted file mode 100644 index 6802959..0000000 --- a/gvdb/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -include $(top_srcdir)/Makefile.gtester - -noinst_LIBRARIES = libgvdb.a libgvdb-shared.a - -libgvdb_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"gvdb\ \(via\ dconf\)\" -libgvdb_a_SOURCES = \ - gvdb-format.h \ - gvdb-builder.h \ - gvdb-builder.c \ - gvdb-reader.h \ - gvdb-reader.c - -libgvdb_shared_a_CFLAGS = $(libgvdb_a_CFLAGS) -fPIC -DPIC -libgvdb_shared_a_SOURCES = $(libgvdb_a_SOURCES) - -EXTRA_DIST = meson.build diff --git a/service/Makefile.am b/service/Makefile.am deleted file mode 100644 index 0199c01..0000000 --- a/service/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -include $(top_srcdir)/Makefile.gtester - -libexec_PROGRAMS = dconf-service - -dbusservice_DATA = ca.desrt.dconf.service - -dconf_service_CFLAGS = $(gio_CFLAGS) -dconf_service_LDADD = \ - ../common/libdconf-common.a \ - ../gvdb/libgvdb.a \ - ../shm/libdconf-shm.a \ - $(gio_LIBS) - -dconf_service_SOURCES = \ - $(BUILT_SOURCES) \ - dconf-blame.c \ - dconf-blame.h \ - dconf-gvdb-utils.c \ - dconf-gvdb-utils.h \ - dconf-service.c \ - dconf-service.h \ - dconf-writer.h \ - dconf-writer.c \ - dconf-keyfile-writer.c \ - dconf-shm-writer.c \ - main.c - -dconf-generated.c: dconf-generated.h - -dconf-generated.h: ca.desrt.dconf.xml Makefile - gdbus-codegen --generate-c-code dconf-generated --c-namespace DConfDBus --interface-prefix=ca.desrt.dconf. $(srcdir)/ca.desrt.dconf.xml - -DISTCLEANFILES = ca.desrt.dconf.service - -BUILT_SOURCES = dconf-generated.c dconf-generated.h -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = ca.desrt.dconf.xml meson.build - -ca.desrt.dconf.service: Makefile - $(AM_V_GEN) (echo '[D-BUS Service]'; \ - echo 'Name=ca.desrt.dconf'; \ - echo 'Exec=${libexecdir}/dconf-service') > $@.tmp && \ - mv $@.tmp $@ diff --git a/shm/Makefile.am b/shm/Makefile.am deleted file mode 100644 index e7d8bc9..0000000 --- a/shm/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -include $(top_srcdir)/Makefile.gtester - -noinst_LIBRARIES = libdconf-shm.a libdconf-shm-shared.a - -libdconf_shm_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\" -libdconf_shm_a_SOURCES = \ - dconf-shm.h \ - dconf-shm.c - -libdconf_shm_shared_a_CFLAGS = $(libdconf_shm_a_CFLAGS) -fPIC -DPIC -libdconf_shm_shared_a_SOURCES = $(libdconf_shm_a_SOURCES) - -EXTRA_DIST = meson.build diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 136160a..0000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,98 +0,0 @@ -include $(top_srcdir)/Makefile.gtester - -noinst_LIBRARIES = libdconf-mock.a -noinst_PROGRAMS = $(TEST_PROGS) -noinst_HEADERS = dconf-mock.h - -libdconf_mock_a_CFLAGS = $(glib_CFLAGS) -libdconf_mock_a_SOURCES = \ - dconf-mock-dbus.c \ - dconf-mock-gvdb.c \ - dconf-mock-shm.c - -TEST_PROGS += paths -paths_CFLAGS = $(glib_CFLAGS) -paths_LDADD = \ - ../common/libdconf-common.a \ - $(gio_LIBS) -paths_SOURCES = paths.c - -TEST_PROGS += changeset -changeset_CFLAGS = $(glib_CFLAGS) -changeset_LDADD = \ - ../common/libdconf-common.a \ - $(glib_LIBS) -changeset_SOURCES = changeset.c - -TEST_PROGS += shm -shm_CFLAGS = $(glib_CFLAGS) -shm_LDADD = \ - ../shm/libdconf-shm.a \ - $(glib_LIBS) \ - $(LIBDL) -shm_SOURCES = \ - shm.c \ - tmpdir.h \ - tmpdir.c - -TEST_PROGS += gvdb -gvdb_CFLAGS = $(glib_CFLAGS) -DSRCDIR=\"$(abs_srcdir)\" -gvdb_LDADD = \ - ../gvdb/libgvdb.a \ - $(glib_LIBS) -gvdb_SOURCES = gvdb.c -EXTRA_DIST = \ - gvdbs/empty_gvdb \ - gvdbs/example_gvdb \ - gvdbs/example_gvdb.big-endian \ - gvdbs/file_empty \ - gvdbs/file_too_small \ - gvdbs/invalid_header \ - gvdbs/nested_gvdb - -TEST_PROGS += gdbus-thread -gdbus_thread_CFLAGS = $(gio_CFLAGS) -DDBUS_BACKEND=\"/gdbus/thread\" -gdbus_thread_LDADD = \ - ../gdbus/libdconf-gdbus-thread.a \ - $(gio_LIBS) -gdbus_thread_SOURCES = dbus.c - -TEST_PROGS += gdbus-filter -gdbus_filter_CFLAGS = $(gio_CFLAGS) -DDBUS_BACKEND=\"/gdbus/filter\" -gdbus_filter_LDADD = \ - ../gdbus/libdconf-gdbus-filter.a \ - $(gio_LIBS) -gdbus_filter_SOURCES = dbus.c - -TEST_PROGS += engine -engine_CFLAGS = $(glib_CFLAGS) -DSRCDIR=\"$(abs_srcdir)\" -engine_LDADD = \ - ../engine/libdconf-engine.a \ - ../common/libdconf-common.a \ - libdconf-mock.a \ - $(glib_LIBS) \ - $(LIBDL) \ - -lm -engine_SOURCES = engine.c -EXTRA_DIST += \ - profile/broken-profile \ - profile/colourful \ - profile/dos \ - profile/empty-profile \ - profile/gdm \ - profile/many-sources \ - profile/no-newline-longline \ - profile/test-profile \ - profile/will-never-exist - -TEST_PROGS += client -client_CFLAGS = $(gio_CFLAGS) -DSRCDIR=\"$(abs_srcdir)\" -client_LDADD = \ - ../client/libdconf-client.a \ - ../engine/libdconf-engine.a \ - ../common/libdconf-common.a \ - libdconf-mock.a \ - $(gio_LIBS) -client_SOURCES = client.c - -EXTRA_DIST += meson.build -- cgit v1.2.1