Changeset 473741b in rtems


Ignore:
Timestamp:
Aug 30, 1999, 3:37:30 PM (20 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
f724a870
Parents:
e49d7c3
Message:

Patch from Ralf Corsepius <corsepiu@…>:

  1. Addition of maintainer-mode dependencies on config.status and aclocal.m4 for autoconf toplevel Makefile.ins. These rules are taken over from automake generated Makefile.ins, i.e. they are contained in any automake generated toplevel Makefile.in. Having this patch in is at least a great releaf for me when working on RTEMS configuration :)
  1. Automated support for #1 in acpolish
  1. Some minor "beautifications" on Makefile.ins resulting from running acpolish.

FYI: This patch has been generated by running
tools/update/rtems-polish.sh -ac on the source tree and manually editing
the resulting patch afterwards to work around a problem with acpolish,
which still corrupts one Makefile.in - WARNING: Be careful with running
acpolish!

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/Makefile.in

    re49d7c3 r473741b  
    77top_srcdir = @top_srcdir@
    88top_builddir = .
     9
     10ACLOCAL = aclocal
     11AUTOCONF = autoconf
     12ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     13ACLOCAL_AMFLAGS = -I @RTEMS_TOPdir@/aclocal
    914
    1015RTEMS_ROOT = @RTEMS_ROOT@
     
    4752        cd $(top_builddir) \
    4853         && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
     54
     55$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
     56        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
     57
     58config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
     59        $(SHELL) ./config.status --recheck
     60$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4)
     61        cd $(srcdir) && $(AUTOCONF)
  • tools/update/acpolish

    re49d7c3 r473741b  
    371371    }
    372372    elsif ( /^[\s]*([^\s+=]+)[\s]*\=[\s]*(.*)$/o )
    373     { # makefile variable
     373    { # makefile variables
    374374      if ( ( "$1" eq "subdir" )
    375         or ( "$1" eq "top_srcdir" )
     375        or ( "$1" eq "top_srcdir" )
    376376        or ( "$1" eq "top_builddir" )
    377377        or ( "$1" eq "RTEMS_ROOT" )
    378         or ( "$1" eq "PROJECT_ROOT" )
     378        or ( "$1" eq "PROJECT_ROOT" )
    379379        or ( "$1" eq "INSTALL" )
    380380        or ( "$1" eq "PACKHEX" )
    381         or ( "$1" eq "INSTALL_CHANGE" )
     381        or ( "$1" eq "INSTALL_CHANGE" )
    382382        or ( "$1" eq "mkinstalldirs" )
     383        or ( "$1" eq "ACLOCAL" )
     384        or ( "$1" eq "AUTOCONF" )
     385        or ( "$1" eq "ACLOCAL_M4" )
     386        or ( "$1" eq "ACLOCAL_AMFLAGS" )
    383387      )
    384388      {
    385         print STDERR "REMOVE: $1\n" if $verbose ;
     389        print STDERR "REMOVE: $1\n" if $verbose ;
    386390      }
    387391      elsif ( "$1" eq "srcdir" )
    388392      { # place marker
    389         push @tbuf, "§0\n";
     393        push @tbuf, "§0\n";
    390394      }
    391395      elsif ( "$1" eq "INSTALLDIRS" )
     
    393397        my $input = $2 ;
    394398        $input =~ s/\\\\/ /g ;
    395         my @l = split(' ',$input);
     399        my @l = split(' ',$input);
    396400        foreach (@l)
    397401        {
     
    468472
    469473      if ( ( "$1" eq "Makefile" )
    470         or ( "$1" eq "\$\(INSTALLDIRS\)" ) )
     474        or ( "$1" eq "\$\(INSTALLDIRS\)" )
     475        or ( "$1" eq "\$\(ACLOCAL_M4\)" )
     476        or ( "$1" eq "config\.status" )
     477        or ( "$1" eq "\$\(srcdir\)/configure" )
     478      )
    471479      { # delete entry
    472480        shift @buffer ;
     
    579587      print "top_srcdir = \@top_srcdir\@\n" ;
    580588      print "top_builddir = $top_builddir\n" ;
    581       print "subdir = $subdir\n" if "$subdir" ;
     589      if ( "$subdir" )
     590      {
     591        print "subdir = $subdir\n";
     592      }
     593      else
     594      {
     595        print "\nACLOCAL = aclocal\n" ;
     596        print "AUTOCONF = autoconf\n" ;
     597        print "ACLOCAL_M4 = \$(top_srcdir)/aclocal.m4\n" ;
     598        print "ACLOCAL_AMFLAGS = -I \@RTEMS_TOPdir\@/aclocal\n" ;
     599      }
    582600      print "\nRTEMS_ROOT = \@RTEMS_ROOT\@\n" ;
    583601      print "PROJECT_ROOT = \@PROJECT_ROOT\@\n\n" ;
     
    640658{
    641659print "Makefile: \$(srcdir)/Makefile.in \$(top_builddir)/config.status\n" ;
    642 print " cd \$(top_builddir) \\\n" ;
    643 print "  && CONFIG_FILES=" ;
     660print "\tcd \$(top_builddir) \\\n" ;
     661print "\t && CONFIG_FILES=" ;
    644662print "\$(subdir)/" if ( "$subdir" );
    645663print "\$@ CONFIG_HEADERS= \$(SHELL) ./config.status\n";
    646664}
    647665
     666if ( ! "$subdir" )
     667{
     668print "\n\$(ACLOCAL_M4): \@MAINTAINER_MODE_TRUE\@ configure.in\n" ;
     669print "\tcd \$(srcdir) && \$(ACLOCAL) \$(ACLOCAL_AMFLAGS)\n" ;
     670print "\nconfig.status: \$(srcdir)/configure \$(CONFIG_STATUS_DEPENDENCIES)\n" ;
     671print "\t\$(SHELL) ./config.status --recheck\n" ;
     672print "\$(srcdir)/configure: \@MAINTAINER_MODE_TRUE\@\$(srcdir)/configure.in";
     673print " \$(ACLOCAL_M4)\n" ;
     674print "\tcd \$(srcdir) && \$(AUTOCONF)\n"
     675}
     676
    648677;1
Note: See TracChangeset for help on using the changeset viewer.