[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kde-common/admin
From:       Dirk Mueller <mueller () kde ! org>
Date:       2003-03-28 1:34:23
[Download RAW message or body]

CVS commit by mueller: 

make sure the fast-creating hooks in configure is reapplied when
configure is regenerated due to dependencies during "make".

Patch by Oswald Buddenhagen <ossi@kde.org>


  M +9 -6      am_edit   1.361
  M +5 -5      cvs.sh   1.75


--- kde-common/admin/am_edit  #1.360:1.361
@@ -928,4 +928,10 @@
 sub tag_AUTOMAKE ()
 {
+    my $lookup1 = '.*cd \$\(srcdir\)\s+&&[\034\s]+\$\(AUTOCONF\)(.*)';
+    if ($MakefileData =~ /\n($lookup1)\n/) {
+        my $newLine1 = "\tcd \$(srcdir) && \$(MAKE) -f admin/Makefile.common configure";
+        substituteLine ($lookup1, $newLine1);
+    }
+
     my $lookup = '.*cd \$\(top_srcdir\)\s+&&[\034\s]+\$\(AUTOMAKE\)(.*)';
     return 1    if ($MakefileData !~ /\n($lookup)\n/);
@@ -2092,7 +2098,5 @@
     if ($MakefileData =~ /\n($lookup)/) {
       $old = $1;
-      $old =~ s/\034/\\\n#>\- /g;         # Fix continuation lines
-      my $newCount = ($new =~ tr/\034//) + ($new =~ tr/\n//) + 1;
-      $new =~ s/\\\n/\034/g;
+      my $newCount = ($new =~ tr/\034\n//) + 1;
       $MakefileData =~ s/\n$lookup/\n#>- $old\n#>\+ $newCount\n$new/;
     } else {
@@ -2107,6 +2111,5 @@
 {
   my ($new) = @_;
-  my $newCount = ($new =~ tr/\034//) + ($new =~ tr/\n//) + 1;
-  $new =~ s/\\\n/\034/g;        # Fix continuation lines
+  my $newCount = ($new =~ tr/\034\n//) + 1;
   $MakefileData .= "\n#>\+ $newCount\n$new";
 }

--- kde-common/admin/cvs.sh  #1.74:1.75
@@ -7,5 +7,5 @@
 # and then does a case to call the correct function.
 
-call_and_fix_autoconf()
+configure()
 {
   $AUTOCONF || exit 1
@@ -112,5 +112,5 @@
 $ACLOCAL || exit 1
 echo "*** Creating configure"
-call_and_fix_autoconf
+configure
 
 if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
@@ -160,5 +160,5 @@
 $AUTOMAKE --foreign --include-deps
 perl -w admin/am_edit
-call_and_fix_autoconf
+configure
 touch stamp-h.in
 if grep "^cvs-local:" $makefile_am >/dev/null; then
@@ -189,5 +189,5 @@
 $AUTOMAKE --foreign --include-deps
 perl -w ../admin/am_edit
-call_and_fix_autoconf
+configure
 }
 
@@ -502,5 +502,5 @@
 arg=`echo $1 | tr '\-.' __`
 case $arg in
-  cvs | dist | subdir_dist | configure_in | configure_files | subdirs | \
+  cvs | dist | subdir_dist | configure | configure_in | configure_files | subdirs | \
   cvs_clean | package_merge | package_messages ) $arg ;;
   * ) echo "Usage: cvs.sh <target>"


[prev in list] [next in list] [prev in thread] [next in thread]