gresource: Make extract work better

[platform/upstream/glib.git] / gio / tests / Makefile.am

diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 1cb0924..4bb71a8 100644 (file)
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -319,11 +319,11 @@ uninstalled_test_extra_programs += \
 test_programs += mimeapps
 clean-local: clean-mimeapps
 clean-mimeapps:
-       rm -rf xdgdatadir xdgdatahome
+       rm -rf xdgdatadir xdgdatahome xdgconfighome
 
 uninstalled_test_programs += gsettings gschema-compile
 gsettings_DEPENDENCIES = test.mo
-CLEANFILES += test.mo de/LC_MESSAGES/test.mo
+CLEANFILES += test.mo de/LC_MESSAGES/test.mo keyfile/gsettings.store
 gsettings_CFLAGS = $(AM_CFLAGS) -DSRCDIR=\"$(abs_srcdir)\"
 test.mo: de.po
        $(AM_V_GEN) $(MSGFMT) -o test.mo $(srcdir)/de.po; \
@@ -435,8 +435,9 @@ gdbus_threading_SOURCES                  = $(gdbus_sessionbus_sources) gdbus-thr
 gmenumodel_SOURCES                       = $(gdbus_sessionbus_sources) gmenumodel.c
 gnotification_SOURCES                    = $(gdbus_sessionbus_sources) gnotification.c gnotification-server.h gnotification-server.c
 
+BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
 gdbus-test-codegen.o: gdbus-test-codegen-generated.h
-gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
        $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
                UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
                $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
@@ -455,6 +456,8 @@ gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml
                --annotate "org.project.Bar::TestSignal[array_of_strings]" Key8 Value8 \
                $(srcdir)/test-codegen.xml \
                $(NULL)
+gdbus-test-codegen-generated.c: gdbus-test-codegen-generated.h
+       @: # Generated as side-effect of .h
 
 EXTRA_DIST += test-codegen.xml
 CLEANFILES += gdbus-test-codegen-generated.[ch] gdbus-test-codegen-generated-doc-*.xml
@@ -542,5 +545,9 @@ giotypefuncs.c: Makefile
          $(SED) -e 's/^/*tp++ = /' -e 's/$$/ ();/' >> xgen-gio && \
          cp xgen-gio $@ # && rm -f xgen-gio xgen-giosrc.c
 
+CLEANFILES += xgen-giosrc.c xgen-gio giotypefuncs.c
+
+if ENABLE_INSTALLED_TESTS
 install-data-hook:
        $(AM_V_at) chmod a+x $(DESTDIR)$(installed_testdir)/x-content/win32-software/autorun.exe
+endif