IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 1338


Ignore:
Timestamp:
Jul 29, 2004, 11:43:11 AM (22 years ago)
Author:
desonia
Message:

tweaked Makefile to push auxillary files (*.d *.o) used during making
to a subdirectory, which reduces the chaff in the directory.

Location:
trunk/psLib/src
Files:
20 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/astronomy/Makefile

    r1315 r1338  
    1212           psCoord.o
    1313
     14OBJS = $(addprefix makedir/,$(SRC_OBJS))
     15
    1416all: $(TARGET_STATIC)
    1517
    1618# Rule to make static library
    1719
    18 libpslib.a:     $(SRC_OBJS)
     20libpslib.a:     $(OBJS)
    1921# The ar option -r is to add/replace object and -s is to create
    2022# a symbol table in the archive
    21         $(AR) rcs ../$@ $(SRC_OBJS)
     23        $(AR) rcs ../$@ $(OBJS)
    2224
    2325# Define PHONY target "install" which will install necessary files
    … …  
    3234clean:
    3335        @echo "    Deleting intermediate files for 'astronomy'"
    34         $(RM) $(SRC_OBJS) *.lint $(SRC_OBJS:.o=.i)
     36        $(RM) $(OBJS) *.lint $(SRC_OBJS:.o=.i)
     37
     38cleandep:
     39        $(RM) $(OBJS:.o=.d)
    3540
    3641%.lint: %.c
    … …  
    4045        $(CC) -E $(CFLAGS) -o $@ $<
    4146
    42 %.o: %.i
     47makedir/%.o: %.c
    4348        $(CC) -c $(CFLAGS) -o $@ $<
    4449
    45 %.d: %.c
     50makedir/%.d: %.c
    4651        $(CC) -MM $(CFLAGS) $< > $@.tmp
    47         sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' $@.tmp > $@
     52        sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@
    4853        $(RM) -f $@.tmp
    4954
    50 include $(SRC_OBJS:.o=.d)
     55include $(OBJS:.o=.d)

  • trunk/psLib/src/collections/Makefile

    r1264 r1338  
    33##  Makefile:   collections
    44##
    5 ##  $Revision: 1.26 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2004-07-22 20:42:54 $
     5##  $Revision: 1.27 $  $Name: not supported by cvs2svn $
     6##  $Date: 2004-07-29 21:43:11 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3737           psArray.o
    3838
     39OBJS = $(addprefix makedir/,$(SRC_OBJS))
     40
    3941# Define PHONY target "all" which will make all the necessary items
    4042
    … …  
    4345# Rule to make static library
    4446
    45 libpslib.a: $(SRC_OBJS)
     47libpslib.a: $(OBJS)
    4648# The ar option -r is to add/replace object and -s is to create
    4749# a symbol table in the archive
    48         $(AR) rcs ../$@ $(SRC_OBJS)
     50        $(AR) rcs ../$@ $(OBJS)
    4951
    5052# Define PHONY target "install" which will install necessary files
    … …  
    6264clean:
    6365        @echo "    Deleting intermediate files for 'collections'"
    64         $(RM) $(SRC_OBJS) *.lint $(SRC_OBJS:.o=.i)
     66        $(RM) $(OBJS) *.lint $(SRC_OBJS:.o=.i)
     67
     68cleandep:
     69        $(RM) $(OBJS:.o=.d)
    6570
    6671%.lint: %.c
    … …  
    7075        $(CC) -E $(CFLAGS) -o $@ $<
    7176
    72 %.o: %.i
     77makedir/%.o: %.c
    7378        $(CC) -c $(CFLAGS) -o $@ $<
    7479
    75 %.d: %.c
     80makedir/%.d: %.c
    7681        $(CC) -MM $(CFLAGS) $< > $@.tmp
    77         sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' $@.tmp > $@
     82        sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@
    7883        $(RM) -f $@.tmp
    7984
    80 include $(SRC_OBJS:.o=.d)
     85include $(OBJS:.o=.d)

  • trunk/psLib/src/dataManip/Makefile

    r1264 r1338  
    1313           psFFT.o \
    1414           psMinimize.o \
    15            
     15 
     16OBJS = $(addprefix makedir/,$(SRC_OBJS))
     17         
    1618all: $(TARGET_STATIC)
    1719
    … …  
    2123# Rule to make static library
    2224
    23 libpslib.a:     $(SRC_OBJS)
     25libpslib.a:     $(OBJS)
    2426# The ar option -r is to add/replace object and -s is to create
    2527# a symbol table in the archive
    26         $(AR) rcs ../$@ $(SRC_OBJS)
     28        $(AR) rcs ../$@ $(OBJS)
    2729
    2830# Define PHONY target "install" which will install necessary files
    … …  
    3739clean:
    3840        @echo "    Deleting intermediate files for 'sysUtils'"
    39         $(RM) $(SRC_OBJS) *.lint $(SRC_OBJS:.o=.i)
     41        $(RM) $(OBJS) *.lint $(SRC_OBJS:.o=.i)
     42
     43cleandep:
     44        $(RM) $(OBJS:.o=.d)
    4045
    4146%.lint: %.c
    … …  
    4550        $(CC) -E $(CFLAGS) -o $@ $<
    4651
    47 %.o: %.i
     52makedir/%.o: %.c
    4853        $(CC) -c $(CFLAGS) -o $@ $<
    4954
    50 %.d: %.c
     55makedir/%.d: %.c
    5156        $(CC) -MM $(CFLAGS) $< > $@.tmp
    52         sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' $@.tmp > $@
     57        sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@
    5358        $(RM) -f $@.tmp
    5459
    55 include $(SRC_OBJS:.o=.d)
     60include $(OBJS:.o=.d)

  • trunk/psLib/src/image/Makefile

    r1266 r1338  
    33##  Makefile:   collections
    44##
    5 ##  $Revision: 1.1 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2004-07-22 20:47:55 $
     5##  $Revision: 1.2 $  $Name: not supported by cvs2svn $
     6##  $Date: 2004-07-29 21:43:11 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3636           psImageStats.o
    3737
     38OBJS = $(addprefix makedir/,$(SRC_OBJS))
     39
    3840# Define PHONY target "all" which will make all the necessary items
    3941
    … …  
    4244# Rule to make static library
    4345
    44 libpslib.a: $(SRC_OBJS)
     46libpslib.a: $(OBJS)
    4547# The ar option -r is to add/replace object and -s is to create
    4648# a symbol table in the archive
    47         $(AR) rcs ../$@ $(SRC_OBJS)
     49        $(AR) rcs ../$@ $(OBJS)
    4850
    4951# Define PHONY target "install" which will install necessary files
    … …  
    6163clean:
    6264        @echo "    Deleting intermediate files for 'collections'"
    63         $(RM) $(SRC_OBJS) *.lint $(SRC_OBJS:.o=.i)
     65        $(RM) $(OBJS) *.lint $(SRC_OBJS:.o=.i)
     66
     67cleandep:
     68        $(RM) $(OBJS:.o=.d)
    6469
    6570%.lint: %.c
    … …  
    6974        $(CC) -E $(CFLAGS) -o $@ $<
    7075
    71 %.o: %.i
     76makedir/%.o: %.c
    7277        $(CC) -c $(CFLAGS) -o $@ $<
    7378
    74 %.d: %.c
     79makedir/%.d: %.c
    7580        $(CC) -MM $(CFLAGS) $< > $@.tmp
    76         sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' $@.tmp > $@
     81        sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@
    7782        $(RM) -f $@.tmp
    7883
    79 include $(SRC_OBJS:.o=.d)
     84include $(OBJS:.o=.d)

  • trunk/psLib/src/sysUtils/Makefile

    r986 r1338  
    33##  Makefile:   sysUtils
    44##
    5 ##  $Revision: 1.16 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2004-06-10 20:40:26 $
     5##  $Revision: 1.17 $  $Name: not supported by cvs2svn $
     6##  $Date: 2004-07-29 21:43:11 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3838           psString.o   
    3939
     40OBJS = $(addprefix makedir/,$(SRC_OBJS))
     41
    4042# Define PHONY target "all" which will make all the necessary items
    4143
    … …  
    4446# Rule to make static library
    4547
    46 libpslib.a: $(SRC_OBJS)
     48libpslib.a: $(OBJS)
    4749# The ar option -r is to add/replace object and -s is to create
    4850# a symbol table in the archive
    49         $(AR) rcs ../$@ $(SRC_OBJS)
     51        $(AR) rcs ../$@ $(OBJS)
    5052
    5153# Define PHONY target "install" which will install necessary files
    … …  
    6365clean:
    6466        @echo "    Deleting intermediate files for 'sysUtils'"
    65         $(RM) $(SRC_OBJS) *.lint
     67        $(RM) $(OBJS) *.lint
     68
     69cleandep:
     70        $(RM) $(OBJS:.o=.d)
    6671
    6772%.lint: %.c
    6873        splint +posixlib -exportlocal -realcompare $(INCLUDE_GLOBAL) $? > $@; cat $@
    6974
    70 %.d: %.c
     75makedir/%.o: %.c
     76        $(CC) -c $(CFLAGS) -o $@ $<
     77
     78makedir/%.d: %.c
    7179        $(CC) -MM $(CFLAGS) $< > $@.tmp
    72         sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' $@.tmp > $@
     80        sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@
    7381        $(RM) -f $@.tmp
    7482
    75 include $(SRC_OBJS:.o=.d)
     83include $(OBJS:.o=.d)
Note: See TracChangeset for help on using the changeset viewer.