Merge branch 'micro' into maint

[platform/upstream/automake.git] / t / subobj7.sh

diff --git a/t/subobj7.sh b/t/subobj7.sh
old mode 100755 (executable)
new mode 100644 (file)
index 863cae0..de73cc2
--- a/t/subobj7.sh
+++ b/t/subobj7.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,15 +17,15 @@
 # Test to make sure AM_CFLAGS appears in subdir compilation rule.
 # Report from Steve M. Robbins.
 
-. ./defs || Exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
 bin_PROGRAMS = wish
 wish_SOURCES = foo.c generic/a.c
 END
@@ -33,6 +33,6 @@ END
 $ACLOCAL
 $AUTOMAKE --add-missing
 
-grep wish_CFLAGS Makefile.in && Exit 1
+grep wish_CFLAGS Makefile.in && exit 1
 
 :