build: Use subdir-objects automake option

This makes automake place the object files in the same subdir as the
source file.  For a recursive build system as we have now, there's
no difference, but with a non-recursive build system it means that
the object files don't all end up in the toplevel directory.
dev
Kristian Høgsberg 11 years ago
parent a72d375667
commit 396a9bb995
  1. 2
      configure.ac
  2. 10
      tests/Makefile.am

@ -21,7 +21,7 @@ AC_CONFIG_HEADERS([config.h])
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
AM_INIT_AUTOMAKE([1.11 parallel-tests foreign no-dist-gzip dist-xz color-tests]) AM_INIT_AUTOMAKE([1.11 parallel-tests foreign no-dist-gzip dist-xz color-tests subdir-objects])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])

@ -52,7 +52,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/shared \ -I$(top_srcdir)/shared \
-I$(top_builddir)/src \ -I$(top_builddir)/src \
-DUNIT_TEST \
$(COMPOSITOR_CFLAGS) $(COMPOSITOR_CFLAGS)
surface_global_test_la_SOURCES = surface-global-test.c surface_global_test_la_SOURCES = surface-global-test.c
@ -133,16 +132,17 @@ if ENABLE_XWAYLAND_TEST
xwayland_test = xwayland.weston xwayland_test = xwayland.weston
endif endif
matrix_test_CPPFLAGS = -DUNIT_TEST
matrix_test_SOURCES = \ matrix_test_SOURCES = \
matrix-test.c \ matrix-test.c \
$(top_srcdir)/shared/matrix.c \ ../shared/matrix.c \
$(top_srcdir)/shared/matrix.h ../shared/matrix.h
matrix_test_LDADD = -lm -lrt matrix_test_LDADD = -lm -lrt
setbacklight_SOURCES = \ setbacklight_SOURCES = \
setbacklight.c \ setbacklight.c \
$(top_srcdir)/src/libbacklight.c \ ../src/libbacklight.c \
$(top_srcdir)/src/libbacklight.h ..//src/libbacklight.h
setbacklight_CFLAGS = $(AM_CFLAGS) $(SETBACKLIGHT_CFLAGS) setbacklight_CFLAGS = $(AM_CFLAGS) $(SETBACKLIGHT_CFLAGS)
setbacklight_LDADD = $(SETBACKLIGHT_LIBS) setbacklight_LDADD = $(SETBACKLIGHT_LIBS)

Loading…
Cancel
Save