Changeset 3749


Ignore:
Timestamp:
Jul 5, 2013 10:07:51 PM (7 years ago)
Author:
gah
Message:

fix Makefiles (one more time)

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.in

    r3741 r3749  
    4242endif
    4343
    44 .PHONY: all test install clean distclean package distrib runtime-distrib $(TARGETS)
     44.PHONY: all test install clean distclean package distrib runtime-distrib \
     45        $(TARGETS)
    4546
    4647all:
  • trunk/gui/scripts/xyresult.tcl

    r3746 r3749  
    666666#       the elements and markers for the graph based on the data objects
    667667#       given.  The axes are also set if min and max have been set for
    668 #       any data object.
     668#       any data object. 
    669669# data in the widget.  Clears any existing data and rebuilds the
    670670# widget to display new data.
     
    856856# USAGE: Rebuild
    857857#
    858 # Called automatically whenever something changes that affects the
     858#       Called automatically whenever something changes that affects the
    859859# data in the widget.  Clears any existing data and rebuilds the
    860860# widget to display new data.
  • trunk/lang/Makefile.in

    r3736 r3749  
    5454.PHONY: all install test clean distclean $(LANGS)
    5555
    56 
    57 all: $(LANGS)
    58 
    59 $(LANGS):
    60         $(MAKE) -C $@ all
     56all:
     57        make -C ../src install
     58        for i in $(LANGS) ; do \
     59          $(MAKE) -C $$i all || exit 1 ;\
     60        done
    6161
    6262install:
  • trunk/lang/R/Makefile.in

    r3746 r3749  
    2121R               = @R@
    2222
    23 coresrcdir      = ${PWD}/$(srcdir)/../../src/core
    24 corelibdir      = ${PWD}/../../src/core
    25 R_flags         = --configure-args='--with-rappture-include=$(includedir) \
     23coresrcdir      = `pwd`/$(srcdir)/../../src/core
     24corelibdir      = `pwd`/../../src/core
     25R_flags         = --configure-args='--with-rappture-include=$(includedir)  \
    2626                                    --with-rappture-lib=$(libdir)'
    2727
  • trunk/packages/vizservers/Makefile.in

    r3471 r3749  
    3737                start_viz.sh
    3838
    39 all:
    40         for i in $(SUBDIRS) ; do \
    41           $(MAKE) -C $$i all || exit 1 ; \
    42         done
     39all: $(SUBDIRS)
     40
     41$(SUBDIRS):
     42        $(MAKE) -C $@ all
    4343
    4444install:
Note: See TracChangeset for help on using the changeset viewer.