diff options
-rw-r--r-- | Makefile-giscanner.am | 12 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | docs/reference/Makefile.am | 2 | ||||
-rw-r--r-- | tests/offsets/Makefile.am | 2 | ||||
-rw-r--r-- | tests/repository/Makefile.am | 8 | ||||
-rw-r--r-- | tests/scanner/Makefile.am | 22 |
6 files changed, 24 insertions, 24 deletions
diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am index b0e13732..06bc4be4 100644 --- a/Makefile-giscanner.am +++ b/Makefile-giscanner.am @@ -1,15 +1,15 @@ ## Process this file with automake to produce Makefile.in -BUILT_SOURCES += \ - scannerparser.c \ - scannerparser.h \ - scannerlexer.c \ - scannerlexer.h +BUILT_SOURCES += \ + giscanner/scannerparser.c \ + giscanner/scannerparser.h \ + giscanner/scannerlexer.c \ + giscanner/scannerlexer.h AM_YFLAGS = -d -t # Why do I have to do this automake? -scannerlexer.h: scannerlexer.c +giscanner/scannerlexer.h: giscanner/scannerlexer.c noinst_LTLIBRARIES += libgiscanner.la diff --git a/configure.ac b/configure.ac index a6e7b368..a3d9d165 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability parallel-tests]) +AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability parallel-tests subdir-objects]) AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 332bd70f..994b1149 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -60,7 +60,7 @@ IGNORE_HFILES= \ # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png HTML_IMAGES= \ - $(srcdir)/images/overview.png + images/overview.png # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). # e.g. content_files=running.sgml building.sgml changes-2.0.sgml diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am index a40e90bf..0df9c151 100644 --- a/tests/offsets/Makefile.am +++ b/tests/offsets/Makefile.am @@ -24,7 +24,7 @@ Offsets-1.0.gir: liboffsets.la offsets.h Offsets_1_0_gir_INCLUDES = GObject-2.0 Offsets_1_0_gir_LIBS = liboffsets.la Offsets_1_0_gir_PACKAGES = gobject-2.0 -Offsets_1_0_gir_FILES = $(srcdir)/offsets.h $(srcdir)/offsets.c +Offsets_1_0_gir_FILES = offsets.h offsets.c Offsets_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error -I$(top_srcdir)/tests INTROSPECTION_GIRS += Offsets-1.0.gir diff --git a/tests/repository/Makefile.am b/tests/repository/Makefile.am index d1cbaa5b..6b4b782f 100644 --- a/tests/repository/Makefile.am +++ b/tests/repository/Makefile.am @@ -5,19 +5,19 @@ LIBS = $(GOBJECT_LIBS) EXTRA_PROGRAMS = gitestrepo giteststructinfo gitestthrows gitypelibtest CLEANFILES = $(EXTRA_PROGRAMS) -gitestrepo_SOURCES = $(srcdir)/gitestrepo.c +gitestrepo_SOURCES = gitestrepo.c gitestrepo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository gitestrepo_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) -giteststructinfo_SOURCES = $(srcdir)/giteststructinfo.c +giteststructinfo_SOURCES = giteststructinfo.c giteststructinfo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository giteststructinfo_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) -gitestthrows_SOURCES = $(srcdir)/gitestthrows.c +gitestthrows_SOURCES = gitestthrows.c gitestthrows_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository gitestthrows_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) -gitypelibtest_SOURCES = $(srcdir)/gitypelibtest.c +gitypelibtest_SOURCES = gitypelibtest.c gitypelibtest_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository gitypelibtest_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 13156c3b..6b705f5d 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -28,18 +28,18 @@ AM_CFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(GTHREAD_CFLAGS) $(GI_HIDDEN_VISIBI AM_LDFLAGS = -rpath /unused -avoid-version LIBS = $(GOBJECT_LIBS) $(GTHREAD_LIBS) -libsletter_la_SOURCES = $(srcdir)/sletter.c $(srcdir)/sletter.h +libsletter_la_SOURCES = sletter.c sletter.h libsletter_la_LIBADD = $(GIO_LIBS) libsletter_la_CFLAGS = $(AM_CFLAGS) libsletter_la_LDFLAGS = $(AM_LDFLAGS) -libutility_la_SOURCES = $(srcdir)/utility.c $(srcdir)/utility.h -libgtkfrob_la_SOURCES = $(srcdir)/gtkfrob.c $(srcdir)/gtkfrob.h +libutility_la_SOURCES = utility.c utility.h +libgtkfrob_la_SOURCES = gtkfrob.c gtkfrob.h libregress_la_SOURCES = \ - $(srcdir)/regress.c $(srcdir)/regress.h \ - $(srcdir)/annotation.c $(srcdir)/annotation.h \ - $(srcdir)/foo.c $(srcdir)/foo.h \ - $(srcdir)/drawable.c $(srcdir)/drawable.h \ + regress.c regress.h \ + annotation.c annotation.h \ + foo.c foo.h \ + drawable.c drawable.h \ $(NULL) REGRESS_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f" libregress_la_CPPFLAGS = -DREGRESS_PRINT_PREVIEW_COMMAND=\"$(REGRESS_PRINT_PREVIEW_COMMAND)\" \ @@ -49,11 +49,11 @@ if HAVE_CAIRO libregress_la_LIBADD += $(CAIRO_LIBS) endif libwarnlib_la_CFLAGS = $(AM_CFLAGS) -libwarnlib_la_SOURCES = $(srcdir)/warnlib.c $(srcdir)/warnlib.h +libwarnlib_la_SOURCES = warnlib.c warnlib.h libwarnlib_la_LIBADD = $(GIO_LIBS) libwarnlib_la_LDFLAGS = -export-symbols-regex '^warnlib_' -no-undefined -libgettype_la_SOURCES = $(srcdir)/gettype.c $(srcdir)/gettype.h -libtypedefs_la_SOURCES = $(srcdir)/typedefs.c $(srcdir)/typedefs.h +libgettype_la_SOURCES = gettype.c gettype.h +libtypedefs_la_SOURCES = typedefs.c typedefs.h testsdir = $(datadir)/gobject-introspection-1.0/tests tests_DATA = $(libregress_la_SOURCES) $(libwarnlib_la_SOURCES) $(libutility_la_SOURCES) @@ -151,7 +151,7 @@ if !OS_WIN32 EXTRA_PROGRAMS = barapp CLEANFILES += $(EXTRA_PROGRAMS) -barapp_SOURCES = $(srcdir)/barapp.c $(srcdir)/barapp.h +barapp_SOURCES = barapp.c barapp.h barapp_LDADD = $(top_builddir)/libgirepository-1.0.la barapp_LDFLAGS = -export-dynamic |