IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 596


Ignore:
Timestamp:
May 6, 2004, 1:25:19 PM (22 years ago)
Author:
evanalst
Message:

Update to build both static and dynamic libraries.

Location:
trunk/psLib/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/Makefile

    r579 r596  
    33##  Makefile:  psLib
    44##
    5 ##  $Revision: 1.6 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2004-05-05 20:46:25 $
     5##  $Revision: 1.7 $  $Name: not supported by cvs2svn $
     6##  $Date: 2004-05-06 23:25:19 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3434ALLTARGETS = sysUtils collections
    3535
     36TARGET_DYNAMIC = libpslib.$(DLL)
     37TARGET_STATIC = libpslib.a
     38
    3639# Define the installation targets
    3740
    … …  
    4851# Define PHONY target "all" which will make all necessary items
    4952
    50 all:    $(ALLTARGETS) 
     53all:    $(ALLTARGETS)
     54        $(BUILD_DYNAMIC1) $(TARGET_STATIC) $(BUILD_DYNAMIC2) $(TARGET_DYNAMIC)
    5155        @echo ""
    5256        @echo "    ---- All targets built successfully $(VERSION) ----"
    … …  
    126130install: installdirs $(INSTALLTARGETS) docs
    127131        install *.h $(includedir)
     132        install $(TARGET_STATIC) $(libexecdir)
     133        install $(TARGET_DYNAMIC) $(libexecdir)
    128134
    129135# Define PHONY target "clean" to clean up the development areas for
    … …  
    131137
    132138clean: $(CLEANTARGETS)
     139        $(RM) -f $(TARGET_STATIC)
     140        $(RM) -f $(TARGET_DYNAMIC)
    133141
    134142# Define PHONY target "distclean" to clean up the distribution area for
    … …  
    136144
    137145distclean: $(DISTCLEANTARGETS)
     146        $(RM) -f $(libexecdir)/$(TARGET_STATIC)
     147        $(RM) -f $(libexecdir)/$(TARGET_DYNAMIC)
    138148
    139149# Define PHONY target "docs" to generate the Doxygen files for psLib

  • trunk/psLib/src/Makefile.Globals

    r515 r596  
    55##  Assumptions:    Variable "prefix" already defined
    66##
    7 ##  $Revision: 1.4 $  $Name: not supported by cvs2svn $
    8 ##  $Date: 2004-04-23 23:40:52 $
     7##  $Revision: 1.5 $  $Name: not supported by cvs2svn $
     8##  $Date: 2004-05-06 23:25:19 $
    99##
    1010##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    5353    SO  = so
    5454    DOCS = doxygen Doxyfile
     55    BUILD_DYNAMIC1 = $(CC) $(LDFLAGS_DLL) -Wl,--whole-archive
     56    BUILD_DYNAMIC2 = -Wl,--no-whole-archive -lm -o
    5557endif
    5658
    … …  
    6365    SO = bundle
    6466    DOCS =
     67    BUILD_DYNAMIC1 = libtool -dynamic -lm
     68    BUILD_DYNAMIC2 = -lm -o
    6569endif
    6670

  • trunk/psLib/src/collections/Makefile

    r593 r596  
    33##  Makefile:   collections
    44##
    5 ##  $Revision: 1.7 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2004-05-06 18:59:41 $
     5##  $Revision: 1.8 $  $Name: not supported by cvs2svn $
     6##  $Date: 2004-05-06 23:24:38 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1919
    2020TARGET_STATIC  = libpslib.a
    21 #TARGET_DYNAMIC = libpslib.$(DLL)
    2221
    2322# Include the make global definitions for the project
    … …  
    4645        $(AR) rcs ../$@ $(SRC_OBJS)
    4746
    48 # Rule to make dynamic library
    49 
    50 libpslib.$(DLL): $(SRC_OBJS)
    51         $(CC) $(LDFLAGS_DLL) $(SRC_OBJS) -o ../$@
    52 
    5347# Define PHONY target "install" which will install necessary files
    5448
    5549install: $(TARGET_STATIC)
    5650        install *.h $(includedir)
    57         install ../$(TARGET_STATIC) $(libexecdir)
    58 #       install ../$(TARGET_DYNAMIC) $(libexecdir)
    5951
    6052# Define PHONY target "distclean" which will cleanup the distribution
    … …  
    6254distclean:      clean
    6355        $(RM) ../$(TARGET_STATIC)
    64 #       $(RM) ../$(TARGET_DYNAMIC)
    65         $(RM) $(libexecdir)/$(TARGET_STATIC)
    66 #       $(RM) $(libexecdir)/$(TARGET_DYNAMIC)
    6756
    6857# Define PHONY target "clean" which will cleanup the development area

  • trunk/psLib/src/sysUtils/Makefile

    r594 r596  
    33##  Makefile:   sysUtils
    44##
    5 ##  $Revision: 1.8 $  $Name: not supported by cvs2svn $
    6 ##  $Date: 2004-05-06 19:00:10 $
     5##  $Revision: 1.9 $  $Name: not supported by cvs2svn $
     6##  $Date: 2004-05-06 23:24:03 $
    77##
    88##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1919
    2020TARGET_STATIC  = libpslib.a
    21 #TARGET_DYNAMIC = libpslib.$(DLL)
    2221
    2322# Include the make global definitions for the project
    … …  
    4241# Define PHONY target "all" which will make all the necessary items
    4342
    44 all: $(TARGET_STATIC)
     43all: $(TARGET_STATIC) 
    4544
    4645# Rule to make static library
    … …  
    5150        $(AR) rcs ../$@ $(SRC_OBJS)
    5251
    53 # Rule to make dynamic library
    54 
    55 libpslib.$(DLL): $(SRC_OBJS)
    56         $(CC) $(LDFLAGS_DLL) $(SRC_OBJS) -o ../$@ 
    57 
    5852# Define PHONY target "install" which will install necessary files
    5953
    6054install: $(TARGET_STATIC)
    6155        install *.h $(includedir)
    62         install ../$(TARGET_STATIC) $(libexecdir)
    63 #       install ../$(TARGET_DYNAMIC) $(libexecdir)
    6456
    6557# Define PHONY target "distclean" which will cleanup the distribution
    … …  
    6759distclean:      clean
    6860        $(RM) ../$(TARGET_STATIC)
    69 #       $(RM) ../$(TARGET_DYNAMIC)
    70         $(RM) $(libexecdir)/$(TARGET_STATIC)
    71 #       $(RM) $(libexecdir)/$(TARGET_DYNAMIC)
    7261
    7362# Define PHONY target "clean" which will cleanup the development area
Note: See TracChangeset for help on using the changeset viewer.