IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 657


Ignore:
Timestamp:
May 12, 2004, 8:06:34 PM (22 years ago)
Author:
gusciora
Message:

I am trying to get our Makefiles to work correctly. In order to do so, I
need to do a fresh check-out. This check-in might break things.

Location:
trunk/psLib
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/Makefile

    r651 r657  
    33##  Makefile:  psLib
    44##
    5 ##  $Revision: 1.9 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2004-05-12 21:49:39 $
     5##  $Revision: 1.10 $  $Name: not supported by cvs2svn $
     6##  $Date: 2004-05-13 06:06:33 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3232# Define the target to build
    3333
    34 ALLTARGETS = sysUtils collections
     34ALLTARGETS = sysUtils collections dataManip
    3535
    3636TARGET_DYNAMIC = libpslib.$(DLL)
    … …  
    3939# Define the installation targets
    4040
    41 INSTALLTARGETS = installSysUtils installCollections
     41INSTALLTARGETS = installSysUtils installCollections installDataManip
    4242
    4343# Define the clean up targets
    4444
    45 CLEANTARGETS = cleanSysUtils cleanCollections
     45CLEANTARGETS = cleanSysUtils cleanCollections cleanDataManip
    4646
    4747# Define the distribution clean up targets
    4848
    49 DISTCLEANTARGETS = distcleanSysUtils distcleanCollections
     49DISTCLEANTARGETS = distcleanSysUtils distcleanCollections distcleanDataManip
    5050
    5151# Define PHONY target "all" which will make all necessary items
    … …  
    6666        $(MAKE) --directory=collections all
    6767
     68dataManip:
     69        $(MAKE) --directory=dataManip all
     70
    6871
    6972## ADD ADDITIONAL PORTIONS OF PSLIB HERE
    … …  
    7881        $(MAKE) --directory=collections install
    7982
     83installDataManip:
     84        $(MAKE) --directory=dataManip install
     85
    8086
    8187# Define PHONY target "cleanSysUtils" which will clean up the development
    … …  
    8894        $(MAKE) --directory=collections clean
    8995
     96cleanDataManip:
     97        $(MAKE) --directory=dataManip clean
     98
    9099# Define PHONY target "distcleanSysUtils which will clean up the distribution
    91100# files related to system utilities
    … …  
    96105distcleanCollections:
    97106        $(MAKE) --directory=collections distclean
     107
     108distcleanDataManip:
     109        $(MAKE) --directory=dataManip distclean
    98110
    99111
    … …  
    156168
    157169# List of PHONY targets with make file
    158 .PHONY:  sysUtils collections
     170.PHONY:  sysUtils collections dataManip

  • trunk/psLib/src/dataManip/Makefile

    r656 r657  
    33endif
    44
    5 # Define the two targets to be built
    6 
    7 TARGET_STATIC  = libpsDataManip.a
    8 
    9 # Include the make global definitions for the project
    10 
     5TARGET_STATIC  = libpslib.a
    116include ../Makefile.Globals
    12 
    13 # Set CFLAGS used by the implicit rule to compile .c
    14 
    15 CFLAGS := $(CFLAGS_RELOC)
    16 
    17 # Define the source objects
    18 
     7CFLAGS := $(CFLAGS_RELOC) -I.
    198SRC_OBJS = psStats.o
    20 
    21 # Define PHONY target "all" which will make all the necessary items
    229
    2310all: $(TARGET_STATIC)
    2411
    25 # Rule to make static library
     12%.o:    %.c
     13        @echo "    Compiling $<. "
     14        $(CC) $(CFLAGS) -I../../include -c $< -o $@
    2615
    27 libpslib.a: $(SRC_OBJS)
     16libpslib.a:     $(SRC_OBJS)
    2817# The ar option -r is to add/replace object and -s is to create
    2918# a symbol table in the archive
    … …  
    3120
    3221# Define PHONY target "install" which will install necessary files
    33 
    3422install: $(TARGET_STATIC)
    3523        install *.h $(includedir)
    3624
    3725# Define PHONY target "distclean" which will cleanup the distribution
    38 
    3926distclean:      clean
    4027        $(RM) ../$(TARGET_STATIC)
    4128
    4229# Define PHONY target "clean" which will cleanup the development area
    43 
    4430clean:
    4531        @echo "    Deleting intermediate files for 'sysUtils'"
    … …  
    5036
    5137
    52 
    53 
    54 
    55 
    56 
    57 
    58 
    59 
    60 
    61 
    62 
    63 
    64 
    65 
    66 
    67 
    68 
    69 
    70 
    71 %.o: %.c
    72         @echo "    Compiling $<. "
    73         $(CC) $(CFLAGS) -I../../include -c $< -o $@
    74 
    75 libpsDataManip.a: $(SRC_OBJS)
    76 #       $(AR) rcs libpsDataManip.a $(SRC_OBJS)
    77         $(AR) rcs ../$@ $(SRC_OBJS)
    78 
    79 install: $(TARGET)
    80         install *.h $(includedir)
    81 
    82 distclean:      clean
    83         $(RM) $(TARGET)
    84 
    85 clean:
    86         @echo "    Deleting intermediate files for 'utilities - $(CFG)'"
    87         $(RM) $(SRC_OBJS) *.lint
    88 
    89 %.lint: %.c
    90         splint +posixlib -exportlocal -realcompare $(INCLUDE_GLOBAL) $? > $@; cat $@

  • trunk/psLib/src/dataManip/psStats.c

    r652 r657  
    1212 *****************************************************************************/
    1313#include "psStats.h"
    14 
    1514/******************************************************************************
    1615    psStatsAlloc(): This routine must create a new psStats data structure.

  • trunk/psLib/src/math/psStats.c

    r652 r657  
    1212 *****************************************************************************/
    1313#include "psStats.h"
    14 
    1514/******************************************************************************
    1615    psStatsAlloc(): This routine must create a new psStats data structure.

  • trunk/psLib/test/dataManip/Makefile

    r654 r657  
    33##  Makefile:   test/sysUtils
    44##
    5 ##  $Revision: 1.1 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2004-05-13 02:02:24 $
     5##  $Revision: 1.2 $  $Name: not supported by cvs2svn $
     6##  $Date: 2004-05-13 06:06:34 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3030
    3131%   : %.o
    32         $(CC) $(LDFLAGS) -L.. -L$(PSLIB_LIB_DIR) -lpslib -lpstest -lpsDataManip -o $@ $<
     32        $(CC) $(LDFLAGS) -L.. -L$(PSLIB_LIB_DIR) -lpslib -lpstest -o $@ $<
    3333
    3434%.lint: %.c
Note: See TracChangeset for help on using the changeset viewer.