diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2017-03-25 15:11:35 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-03-25 15:11:35 +0000 |
| commit | fb3eb6e6d47c2f13abf6e5b32c29b2822c32903f (patch) | |
| tree | 542c699cfa93def6706e7f3c02ea113250de7156 | |
| parent | 593794d3b4762bf9dd7d97fe2224cbbf70511b8b (diff) | |
| download | clutter-gtk-fb3eb6e6d47c2f13abf6e5b32c29b2822c32903f.tar.gz | |
build: Use subdir-objects
Modernise the build system just a bit.
| -rw-r--r-- | clutter-gtk/Makefile.am | 40 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 21 insertions, 21 deletions
diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am index 7dc484a..9dd9750 100644 --- a/clutter-gtk/Makefile.am +++ b/clutter-gtk/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = AM_CPPFLAGS = \ - -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) \ + -I$(top_srcdir) -I$(top_builddir) \ -DG_LOG_DOMAIN=\"Clutter-Gtk\" \ -DPREFIX=\""$(prefix)"\" \ -DLIBDIR=\""$(libdir)"\" \ @@ -22,26 +22,26 @@ AM_CFLAGS = $(MAINTAINER_CFLAGS) $(CLUTTER_GTK_DEPS_CFLAGS) lib_LTLIBRARIES = libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la source_c = \ - $(srcdir)/gtk-clutter-actor.c \ - $(srcdir)/gtk-clutter-embed.c \ - $(srcdir)/gtk-clutter-offscreen.c \ - $(srcdir)/gtk-clutter-texture.c \ - $(srcdir)/gtk-clutter-util.c \ - $(srcdir)/gtk-clutter-window.c \ - $(NULL) + gtk-clutter-actor.c \ + gtk-clutter-embed.c \ + gtk-clutter-offscreen.c \ + gtk-clutter-texture.c \ + gtk-clutter-util.c \ + gtk-clutter-window.c \ + $() source_h_public = \ - $(srcdir)/gtk-clutter-actor.h \ - $(srcdir)/gtk-clutter-embed.h \ - $(srcdir)/gtk-clutter-texture.h \ - $(srcdir)/gtk-clutter-util.h \ - $(srcdir)/gtk-clutter-window.h \ - $(NULL) + gtk-clutter-actor.h \ + gtk-clutter-embed.h \ + gtk-clutter-texture.h \ + gtk-clutter-util.h \ + gtk-clutter-window.h \ + $() source_h_private = \ - $(srcdir)/gtk-clutter-offscreen.h \ - $(srcdir)/gtk-clutter-actor-internal.h \ - $(NULL) + gtk-clutter-offscreen.h \ + gtk-clutter-actor-internal.h \ + $() # please, keep the list sorted alphabetically libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(source_c) $(source_h) $(source_h_private) @@ -54,9 +54,9 @@ cluttergtkheadersdir = $(includedir)/clutter-gtk-@CLUTTER_GTK_API_VERSION@/clutt # please, keep the list sorted alphabetically cluttergtkheaders_HEADERS = \ - $(top_srcdir)/clutter-gtk/clutter-gtk.h \ - $(top_builddir)/clutter-gtk/gtk-clutter-version.h \ - $(source_h_public) \ + clutter-gtk.h \ + gtk-clutter-version.h \ + $(source_h_public) \ $(NULL) EXTRA_DIST += gtk-clutter-version.h.in diff --git a/configure.ac b/configure.ac index cf48c73..5c90661 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([clutter-gtk/clutter-gtk.h]) AC_CONFIG_AUX_DIR([build]) AC_CONFIG_MACRO_DIR([build/autotools]) -AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability no-define no-dist-gzip dist-xz tar-ustar]) +AM_INIT_AUTOMAKE([1.14 subdir-objects foreign -Wno-portability no-define no-dist-gzip dist-xz tar-ustar]) AM_SILENT_RULES([yes]) |