Ignore:
Timestamp:
Mar 8, 2013, 1:07:32 PM (12 years ago)
Author:
ldelgass
Message:

Makefile fixes: make 'install' target always depend on 'all' target. This
ensures that an up to date build exists before installing, and also permits
the use of "make install" in place of "make all install" or "make all; make install". It doesn't affect the existing build scripts. Likewise, make 'distclean'
always depend on 'clean'. Remove empty contour objects example, as there is no
corresponding object class. Also declare all the standard targets 'all, install,
etc' in the .PHONY section for performance.

Location:
trunk/examples/objects
Files:
1 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/objects/Makefile.in

    r1566 r3471  
    1515RM              = rm -f
    1616
    17 #               dxReader \
    1817#               dxWriter \
    1918
    … …  
    3231
    3332destdir    = $(prefix)/examples/objects
     33
     34.PHONY: all install clean distclean
    3435
    3536all:

  • trunk/examples/objects/axis/Makefile.in

    r2071 r3471  
    4242                axis
    4343
     44.PHONY: all install clean distclean
     45
    4446all: $(PROGS)
    4547
    … …  
    4749        $(CXX) $(CXX_SWITCHES) -o $@ $< $(LIBS)
    4850
    49 install:
     51install: all
    5052        $(MKDIR_P) -m 0755 $(destdir)
    5153        for i in $(FILES) ; do \

  • trunk/examples/objects/curve/Makefile.in

    r2071 r3471  
    4242                curve
    4343
     44.PHONY: all install clean distclean
     45
    4446all: $(PROGS)
    4547
    … …  
    4749        $(CXX) $(CXX_SWITCHES) -o $@ $< $(LIBS)
    4850
    49 install:
     51install: all
    5052        $(MKDIR_P) -m 0755 $(destdir)
    5153        for i in $(FILES) ; do \

  • trunk/examples/objects/dxWriter/Makefile.in

    r2071 r3471  
    3838                dxwrite
    3939
     40.PHONY: all install clean distclean
     41
    4042all: $(PROGS)
    4143
    … …  
    4345        $(CXX) $(CXX_SWITCHES) -o $@ $< $(LIBS)
    4446
    45 install:
     47install: all
    4648        $(MKDIR_P) -m 0755 $(destdir)
    4749        for i in $(FILES) ; do \

  • trunk/examples/objects/floatBuffer/Makefile.in

    r2071 r3471  
    3737                floatbuffer \
    3838
     39.PHONY: all install clean distclean
     40
    3941all: $(PROGS)
    4042
    … …  
    4345        $(CXX) $(CXX_SWITCHES) -o $@ $< $(LIBS)
    4446
    45 install:
     47install: all
    4648        $(MKDIR_P) -m 0755 $(destdir)
    4749        for i in $(FILES) ; do \

  • trunk/examples/objects/histogram/Makefile.in

    r2071 r3471  
    4242                histogram
    4343
     44.PHONY: all install clean distclean
     45
    4446all: $(PROGS)
    4547
    … …  
    4749        $(CXX) $(CXX_SWITCHES) -o $@ $< $(LIBS)
    4850
    49 install:
     51install: all
    5052        $(MKDIR_P) -m 0755 $(destdir)
    5153        for i in $(FILES) ; do \

  • trunk/examples/objects/library/Makefile.in

    r2071 r3471  
    4848                library
    4949
     50.PHONY: all install clean distclean
     51
    5052all: $(PROGS)
    5153
    … …  
    5355        $(CXX) $(CXX_SWITCHES) -o $@ $< $(LIBS)
    5456
    55 install:
     57install: all
    5658        $(MKDIR_P) -m 0755 $(destdir)
    5759        for i in $(FILES) ; do \

  • trunk/examples/objects/number/Makefile.in

    r2071 r3471  
    4242                number
    4343
     44.PHONY: all install clean distclean
     45
    4446all: $(PROGS)
    4547
    … …  
    4749        $(CXX) $(CXX_SWITCHES) -o $@ $< $(LIBS)
    4850
    49 install:
     51install: all
    5052        $(MKDIR_P) -m 0755 $(destdir)
    5153        for i in $(FILES) ; do \

  • trunk/examples/objects/path/Makefile.in

    r2071 r3471  
    4242                path
    4343
     44.PHONY: all install clean distclean
     45
    4446all: $(PROGS)
    4547
    … …  
    4749        $(CXX) $(CXX_SWITCHES) -o $@ $< $(LIBS)
    4850
    49 install:
     51install: all
    5052        $(MKDIR_P) -m 0755 $(destdir)
    5153        for i in $(FILES) ; do \

  • trunk/examples/objects/plot/Makefile.in

    r2071 r3471  
    4242                plot
    4343
     44.PHONY: all install clean distclean
     45
    4446all: $(PROGS)
    4547
    … …  
    4749        $(CXX) $(CXX_SWITCHES) -o $@ $< $(LIBS)
    4850
    49 install:
     51install: all
    5052        $(MKDIR_P) -m 0755 $(destdir)
    5153        for i in $(FILES) ; do \

  • trunk/examples/objects/scatter/Makefile.in

    r2071 r3471  
    4242                scatter
    4343
     44.PHONY: all install clean distclean
     45
    4446all: $(PROGS)
    4547
    … …  
    4749        $(CXX) $(CXX_SWITCHES) -o $@ $< $(LIBS)
    4850
    49 install:
     51install: all
    5052        $(MKDIR_P) -m 0755 $(destdir)
    5153        for i in $(FILES) ; do \

  • trunk/examples/objects/string/Makefile.in

    r2071 r3471  
    4242                string
    4343
     44.PHONY: all install clean distclean
     45
    4446all: $(PROGS)
    4547
    … …  
    4749        $(CXX) $(CXX_SWITCHES) -o $@ $< $(LIBS)
    4850
    49 install:
     51install: all
    5052        $(MKDIR_P) -m 0755 $(destdir)
    5153        for i in $(FILES) ; do \

  • trunk/examples/objects/tree/Makefile.in

    r2071 r3471  
    4242                tree
    4343
     44.PHONY: all install clean distclean
     45
    4446all: $(PROGS)
    4547
    … …  
    4749        $(CC) $(CC_SWITCHES) -o $@ $< $(LIBS)
    4850
    49 install:
     51install: all
    5052        $(MKDIR_P) -m 0755 $(destdir)
    5153        for i in $(FILES) ; do \

  • trunk/examples/objects/xmlparser/Makefile.in

    r2071 r3471  
    4949                xmlparser
    5050
     51.PHONY: all install clean distclean
     52
    5153all: $(PROGS)
    5254
    … …  
    5456        $(CXX) $(CXX_SWITCHES) -o $@ $< $(LIBS)
    5557
    56 install:
     58install: all
    5759        $(MKDIR_P) -m 0755 $(destdir)
    5860        for i in $(FILES) ; do \
Note: See TracChangeset for help on using the changeset viewer.