Merge pull request #15 from mvidner/automake-warnings

fixed automake warnings about configure.in and INCLUDES
yast · Jul 18, 2013 · 333c1b5 · 333c1b5
2 parents 34e98e4 + c16445d
commit 333c1b5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/devtools/bin/y2autoconf b/devtools/bin/y2autoconf
@@ -2,14 +2,14 @@
 my $message = << 'END';
 #y2autoconf [-h|--help]
 #
-#Create YaST2 configure.in from configure.in.in
+#Create YaST2 configure.ac from configure.ac.in (or from configure.in.in)
 #
-#Available macros in the configure.in.in:
+#Available macros in the configure.ac.in:
 #  @RPMNAME@                - reads it from file RPMNAME
 #  @VERSION@                - reads it from file VERSION
 #  @MAINTAINER@             - reads it from file MAINTAINER
 #
-#  @YAST2-INIT-COMMON@      - Initialization. The generated configure.in
+#  @YAST2-INIT-COMMON@      - Initialization. The generated configure.ac
 #                              will not work without it (or its equivalent)
 #  @YAST2-INIT-PROGRAM@     - Initilazation necessary for packages with programs
 #  @YAST2-INIT-PO@          -                        with translations
@@ -412,16 +412,19 @@ else
 chomp $devtools_version;
 
 # main program
-print STDERR "y2autoconf: Generating toplevel configure.in\n";
+print STDERR "y2autoconf: Generating toplevel configure.ac\n";
 
-open(INPUT, '<', "configure.in.in") or die "y2autoconf: Cannot open configure.in.in!\n";
-open(OUTPUT, '>', "configure.in") or die "y2autoconf: Cannot open configure.in!\n";
+open(INPUT, '<', "configure.ac.in") or
+    open(INPUT, '<', "configure.in.in") or
+    die "y2autoconf: Cannot open configure.ac.in nor configure.in.in !\n";
+open(OUTPUT, '>', "configure.ac") or die "y2autoconf: Cannot open configure.ac!\n";
+unlink("configure.in"); # avoid 'configure.ac' and 'configure.in' both present
 
 print OUTPUT
-    "dnl configure.in for $RPMNAME\n" .
+    "dnl configure.ac for $RPMNAME\n" .
     "dnl\n" .
     "dnl -- This file is generated by y2autoconf ${devtools_version} - DO NOT EDIT! --\n" .
-    "dnl    (edit configure.in.in instead)\n";
+    "dnl    (edit configure.ac.in or configure.in.in instead)\n";
 
 # FIXME: when all packages use create-spec and everything works fine,
 # replace these macros in all sources and remove them here.

diff --git a/devtools/skeletons/agent/src/Makefile.am b/devtools/skeletons/agent/src/Makefile.am
@@ -19,4 +19,4 @@ libpy2ag_XXpkgXX_la_SOURCES =				\
 libpy2ag_XXpkgXX_la_LDFLAGS = -version-info 2:0
 libpy2ag_XXpkgXX_la_LIBADD = @AGENT_LIBADD@
 
-INCLUDES = -I$(includedir)
+AM_CPPFLAGS = -I$(includedir)
diff --git a/package/yast2-devtools.changes b/package/yast2-devtools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jul 18 11:14:32 UTC 2013 - mvidner@suse.com
+
+- fixed automake warnings about configure.in and INCLUDES
+
 -------------------------------------------------------------------
 Thu Jul 18 07:35:47 UTC 2013 - lslezak@suse.cz
 

diff --git a/y2logview/y2log_ana/Makefile.am b/y2logview/y2log_ana/Makefile.am
@@ -8,7 +8,7 @@ else
 Y2L =
 endif
 
-INCLUDES = $(Qt4_CFLAGS) -I.
+AM_CPPFLAGS = $(Qt4_CFLAGS) -I.
 
 noinst_PROGRAMS		= $(Y2L)