Changeset 942


Ignore:
Timestamp:
Mar 11, 2008 4:22:12 PM (16 years ago)
Author:
gah
Message:

Makefile fixups

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.in

    r926 r942  
    11
     2bindir          = @bindir@
     3datadir         = @datarootdir@
     4exec_prefix     = @exec_prefix@
     5includedir      = @includedir@
     6libdir          = @libdir@
     7mandir          = @mandir@
    28prefix          = @prefix@
    3 exec_prefix     = @exec_prefix@
    4 bindir          = @bindir@
    5 libdir          = @libdir@
    6 includedir      = @includedir@
    7 mandir          = @mandir@
    89
    9 INSTALL                 = @INSTALL@
     10INSTALL         = @INSTALL@
    1011INSTALL_PROGRAM = ${INSTALL} -m 755
    1112INSTALL_DATA    = ${INSTALL} -m 644
    … …  
    1314
    1415
    15 build_date := $(shell date +%Y%m%d)
    16 machine := $(shell uname -m | sed 's/\ //')
    17 os := $(shell uname -s)
    18 bn := $(shell basename $(prefix))
     16build_date      := $(shell date +%Y%m%d)
     17machine         := $(shell uname -m | sed 's/\ //')
     18os              := $(shell uname -s)
     19bn              := $(shell basename $(prefix))
    1920TarfileBasename=rappture-$(os)-$(machine)-$(build_date)
    2021
    … …  
    2324install: install_rplib install_bindings install_gui install_examples
    2425        ${INSTALL_PROGRAM}  gui/apps/rappture      $(bindir)/rappture
    25         ${INSTALL_DATA}  gui/apps/rappture.env  $(bindir)/rappture.env
     26        ${INSTALL_DATA}     gui/apps/rappture.env  $(bindir)/rappture.env
    2627        ${INSTALL_PROGRAM}  gui/apps/driver        $(bindir)/driver
    2728        ${INSTALL_PROGRAM}  gui/apps/nanovis-test  $(bindir)/nanovis-test
    … …  
    3839build_gui:
    3940        @if test "x@ENABLE_GUI@" == "xyes" ; then \
    40                 make -C gui; \
     41                $(MAKE) -C gui; \
    4142        fi
    4243
    4344install_gui:
    4445        @if test "x@ENABLE_GUI@" == "xyes" ; then \
    45                 make -C gui install; \
     46                $(MAKE) -C gui install; \
    4647        fi
    4748
    … …  
    5051                mkdir include;\
    5152        fi
    52         make -C src2/core librappture2.a librappture2.so.0.0
    53         make -C src librappture;
     53        $(MAKE) -C src2/core librappture2.a librappture2.so.0.0
     54        $(MAKE) -C src librappture
    5455
    5556install_rplib:
    56         make -C src2/core install;
    57         make -C src install_rappture;
     57        $(MAKE) -C src2/core install
     58        $(MAKE) -C src install_rappture
    5859
    5960build_bindings: build_matlab build_octave build_python build_perl
    … …  
    6869build_examples:
    6970ifneq ($(strip @F77@),)
    70         make -C examples/app-fermi/fortran
     71        $(MAKE) -C examples/app-fermi/fortran
    7172endif
    7273ifneq ($(strip @CC@),)
    73         make -C examples/app-fermi/cee
    74         make -C examples/app-fermi/wrapper/cee
    75         make -C examples/c-example
     74        $(MAKE) -C examples/app-fermi/cee
     75        $(MAKE) -C examples/app-fermi/wrapper/cee
     76        $(MAKE) -C examples/c-example
    7677endif
    7778
    … …  
    9091        @if test "x@TCLSH@" != "x" ; then \
    9192                cd tcl; $(bindir)/tclsh install.tcl; cd -;\
    92                 make -C src/tcl install; \
     93                $(MAKE) -C src/tcl install; \
    9394        fi
    9495
    … …  
    9697build_matlab:
    9798        @if test "x@MEX@" != "x" ; then \
    98                 make -C src/matlab; \
     99                $(MAKE) -C src/matlab; \
    99100        fi
    100101
    101102install_matlab: build_matlab
    102103        @if test "x@MEX@" != "x" ; then \
    103                 make -C src/matlab install; \
     104                $(MAKE) -C src/matlab install; \
    104105        fi
    105106
    … …  
    107108build_octave:
    108109        @if test "x@MKOCTFILE@" != "x" ; then \
    109                 make -C src/octave; \
     110                $(MAKE) -C src/octave; \
    110111        fi
    111112
    112113install_octave: build_octave
    113114        @if test "x@MKOCTFILE@" != "x" ; then \
    114                 make -C src/octave install; \
     115                $(MAKE) -C src/octave install; \
    115116        fi
    116117
    … …  
    136137                cd perl; \
    137138                @PERL@ Makefile.PL INSTALLSITELIB=$(libdir)/perl5 INSTALLSITEARCH=$(libdir)/perl5 INSTALLSITEMAN3DIR=$(mandir)/man3; \
    138                 make; LD_LIBRARY_PATH=$(libdir):../src make test; \
     139                $(MAKE); LD_LIBRARY_PATH=$(libdir):../src $(MAKE) test; \
    139140        fi
    140141
    141142install_perl: build_perl
    142143        @if test "x@PERL@" != "x" ; then \
    143                 make -C perl install; \
     144                $(MAKE) -C perl install; \
    144145        fi
    145146
    … …  
    152153
    153154clean:
    154         make -C examples/app-fermi/cee clean
    155         make -C examples/app-fermi/fortran clean
    156         make -C examples/app-fermi/wrapper/cee clean
    157         make -C examples/c-example clean
    158         make -C gui clean
     155        $(MAKE) -C examples/app-fermi/cee clean
     156        $(MAKE) -C examples/app-fermi/fortran clean
     157        $(MAKE) -C examples/app-fermi/wrapper/cee clean
     158        $(MAKE) -C examples/c-example clean
     159        $(MAKE) -C gui clean
    159160        @if test -r "perl/Makefile" ; then \
    160                 make -C perl clean; \
     161                $(MAKE) -C perl clean; \
    161162        fi
    162163        rm -rf python/build
    163         make -C src clean
    164         make -C src/matlab clean
    165         make -C src/octave clean
    166         make -C src/tcl clean
    167         make -C src2/core clean
     164        $(MAKE) -C src clean
     165        $(MAKE) -C src/matlab clean
     166        $(MAKE) -C src/octave clean
     167        $(MAKE) -C src/tcl clean
     168        $(MAKE) -C src2/core clean
    168169        rm -f include/*
    169170
    170171distclean:
    171172        rm -f examples/demo.bash
    172         make -C examples/app-fermi/cee distclean
    173         make -C examples/app-fermi/fortran distclean
    174         make -C examples/app-fermi/wrapper/cee distclean
    175         make -C examples/c-example distclean
    176         make -C gui distclean
    177         make -C perl clean; rm perl/Makefile.PL
     173        $(MAKE) -C examples/app-fermi/cee distclean
     174        $(MAKE) -C examples/app-fermi/fortran distclean
     175        $(MAKE) -C examples/app-fermi/wrapper/cee distclean
     176        $(MAKE) -C examples/c-example distclean
     177        $(MAKE) -C gui distclean
     178        $(MAKE) -C perl clean; rm perl/Makefile.PL
    178179        rm -rf python/build python/setup.py
    179         make -C src distclean
    180         make -C src/matlab distclean
    181         make -C src/octave distclean
    182         make -C src/tcl distclean
    183         make -C src2/core distclean
    184         make -C test distclean
     180        $(MAKE) -C src distclean
     181        $(MAKE) -C src/matlab distclean
     182        $(MAKE) -C src/octave distclean
     183        $(MAKE) -C src/tcl distclean
     184        $(MAKE) -C src2/core distclean
     185        $(MAKE) -C test distclean
    185186        rm -f gui/apps/rappture gui/apps/simsim gui/apps/rappture.env;
    186187        rm -rf Makefile config.status config.log bin;

  • trunk/configure

    r905 r942  
    710710FFLAGS'
    711711ac_subdirs_all='gui
    712 src/tcl '
     712src/tcl
     713optimizer/src '
    713714
    714715# Initialize some variables set by options.
    … …  
    55895590fi
    55905591
    5591 ac_config_files="$ac_config_files Makefile examples/demo.bash examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/wrapper/cee/Makefile examples/c-example/Makefile perl/Makefile.PL python/setup.py src/Makefile src/matlab/Makefile src/octave/Makefile src2/core/Makefile test/Makefile gui/apps/simsim gui/apps/rappture gui/apps/rappture.env"
     5592subdirs="$subdirs optimizer/src"
     5593
     5594
     5595ac_config_files="$ac_config_files Makefile examples/demo.bash examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/wrapper/cee/Makefile examples/c-example/Makefile optimizer/src/Makefile perl/Makefile.PL python/setup.py src/Makefile src/matlab/Makefile src/octave/Makefile src2/core/Makefile test/Makefile gui/apps/simsim gui/apps/rappture gui/apps/rappture.env"
    55925596
    55935597cat >confcache <<\_ACEOF
    … …  
    61656169    "examples/app-fermi/wrapper/cee/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/cee/Makefile" ;;
    61666170    "examples/c-example/Makefile") CONFIG_FILES="$CONFIG_FILES examples/c-example/Makefile" ;;
     6171    "optimizer/src/Makefile") CONFIG_FILES="$CONFIG_FILES optimizer/src/Makefile" ;;
    61676172    "perl/Makefile.PL") CONFIG_FILES="$CONFIG_FILES perl/Makefile.PL" ;;
    61686173    "python/setup.py") CONFIG_FILES="$CONFIG_FILES python/setup.py" ;;

  • trunk/configure.in

    r905 r942  
    389389fi
    390390
     391ls
     392AC_CONFIG_SUBDIRS( [optimizer/src] )
     393
    391394dnl read Makefile.in and write Makefile
    392395AC_OUTPUT(  Makefile \
    … …  
    396399            examples/app-fermi/wrapper/cee/Makefile \
    397400            examples/c-example/Makefile \
     401            optimizer/src/Makefile \
    398402            perl/Makefile.PL \
    399403            python/setup.py \

  • trunk/examples/zoo/field/tool.xml

    r572 r942  
    1212    tclsh @tool/field.tcl @driver
    1313  </command>
     14  <limits>
     15    <cputime>unlimited</cputime>
     16    <filesize>unlimited</filesize>
     17  </limits>
    1418</tool>
    1519<input>
    … …  
    6266    <about><label>3D Field</label></about>
    6367    <component>
    64       <style>-color yellow</style>
     68      <style>
     69        -color blue:yellow:red
     70      </style>
    6571    </component>
    6672  </field>

  • trunk/gui/apps/driver

    r728 r942  
    190190$win.pager insert end -name analyzer -title "Simulate"
    191191set f [$win.pager page analyzer]
    192 $win.pager page analyzer -command [list $f.analyze simulate -ifneeded]
     192$win.pager page analyzer -command [subst {
     193    blt::busy hold $win.pager
     194    update
     195    $f.analyze simulate -ifneeded
     196    blt::busy release $win.pager
     197}]
    193198
    194199Rappture::Analyzer $f.analyze $tool -simcontrol auto

  • trunk/optimizer/src/Makefile.in

    r898 r942  
    1 # Makefile.in --
     1e Makefile.in --
    22#
    33#       This file is a Makefile for Sample TEA Extension.  If it has the name
    … …  
    7474bindir          = @bindir@
    7575libdir          = @libdir@
    76 datadir         = @datadir@
     76datadir         = @datarootdir@
    7777mandir          = @mandir@
    7878includedir      = @includedir@

  • trunk/optimizer/src/configure.in

    r898 r942  
    194194AC_SUBST(NODOT_VERSION)
    195195
     196AC_CONFIG_SUBDIRS( [pgapack/gekco/pgapack] )
    196197#--------------------------------------------------------------------
    197198# Finally, substitute all of the various values into the Makefile.

  • trunk/src/Makefile.in

    r762 r942  
    11
     2bindir          = @bindir@
     3datadir         = @datarootdir@
     4exec_prefix     = @exec_prefix@
     5includedir      = @includedir@
     6libdir          = @libdir@
     7mandir          = @mandir@
    28prefix          = @prefix@
    3 exec_prefix     = @exec_prefix@
    4 bindir          = @bindir@
    5 libdir          = @libdir@
    6 includedir      = @includedir@
    7 mandir          = @mandir@
    8 
    9 INSTALL                 = @INSTALL@
     9
     10INSTALL         = @INSTALL@
    1011INSTALL_PROGRAM = ${INSTALL} -m 755
    1112INSTALL_DATA    = ${INSTALL} -m 644

  • trunk/src/matlab/Makefile.in

    r718 r942  
    11
     2bindir          = @bindir@
     3datadir         = @datarootdir@
     4exec_prefix     = @exec_prefix@
     5includedir      = @includedir@
     6libdir          = @libdir@
     7mandir          = @mandir@
    28prefix          = @prefix@
    3 exec_prefix     = @exec_prefix@
    4 bindir          = @bindir@
    5 libdir          = @libdir@
    6 includedir      = @includedir@
    7 mandir          = @mandir@
    89
    9 INSTALL                 = @INSTALL@
     10INSTALL         = @INSTALL@
    1011INSTALL_PROGRAM = ${INSTALL} -m 755
    1112INSTALL_DATA    = ${INSTALL} -m 644

  • trunk/src/octave/Makefile.in

    r718 r942  
    11
     2bindir          = @bindir@
     3datadir         = @datarootdir@
     4exec_prefix     = @exec_prefix@
     5includedir      = @includedir@
     6libdir          = @libdir@
     7mandir          = @mandir@
    28prefix          = @prefix@
    3 exec_prefix     = @exec_prefix@
    4 bindir          = @bindir@
    5 libdir          = @libdir@
    6 includedir      = @includedir@
    7 mandir          = @mandir@
    89
    9 INSTALL                 = @INSTALL@
     10INSTALL         = @INSTALL@
    1011INSTALL_PROGRAM = ${INSTALL} -m 755
    1112INSTALL_DATA    = ${INSTALL} -m 644

  • trunk/src/tcl/Makefile.in

    r708 r942  
    7878bindir          = @bindir@
    7979libdir          = @libdir@
    80 datadir         = @datadir@
     80datadir         = @datarootdir@
    8181mandir          = @mandir@
    8282includedir      = @includedir@
Note: See TracChangeset for help on using the changeset viewer.