Merge branch 'micro' into maint

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

diff --git a/t/specflg9.sh b/t/specflg9.sh
old mode 100755 (executable)
new mode 100644 (file)
index 96e7a2e..4f3d3b0
--- a/t/specflg9.sh
+++ b/t/specflg9.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-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
@@ -16,15 +16,15 @@
 
 # Another check for per-target flag substitutions.
 
-. ./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 = zzfoo zzbar
 zzfoo_SOURCES = sub/foo.c
 zzbar_SOURCES = bar.c
@@ -36,10 +36,10 @@ $AUTOMAKE --add-missing
 
 $FGREP '$(AM_CFLAGS)' Makefile.in
 
-$FGREP '$(zzfoo_CFLAGS)' Makefile.in && Exit 1
-$FGREP '$(zzfoo_CPPFLAGS)' Makefile.in && Exit 1
+$FGREP '$(zzfoo_CFLAGS)' Makefile.in && exit 1
+$FGREP '$(zzfoo_CPPFLAGS)' Makefile.in && exit 1
 
-$FGREP '$(zzbar_CFLAGS)' Makefile.in && Exit 1
+$FGREP '$(zzbar_CFLAGS)' Makefile.in && exit 1
 $FGREP '$(zzbar_CPPFLAGS)' Makefile.in
 
 :