IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 8569


Ignore:
Timestamp:
Aug 24, 2006, 1:13:37 PM (20 years ago)
Author:
jhoblitt
Message:

rename library & utilities from psModule -> psModules

Location:
trunk/psModules
Files:
2 added
2 deleted
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/Doxyfile.in

    r5067 r8569  
    3131# where doxygen was started. If left blank the current directory will be used.
    3232
    33 OUTPUT_DIRECTORY       = @prefix@/docs/psmodule
     33OUTPUT_DIRECTORY       = @prefix@/docs/psmodules
    3434
    3535# The OUTPUT_LANGUAGE tag is used to specify the language in which all

  • trunk/psModules/Makefile.am

    r7215 r8569  
    11SUBDIRS = src test
    22
    3 bin_SCRIPTS = psmodule-config
     3bin_SCRIPTS = psmodules-config
    44
    55pkgconfigdir = $(libdir)/pkgconfig
    6 pkgconfig_DATA= psmodule.pc
     6pkgconfig_DATA= psmodules.pc
    77
    88EXTRA_DIST = \
    99        Doxyfile.in \
    10         psmodule-config.in \
    11         psmodule.pc.in \
     10        psmodules-config.in \
     11        psmodules.pc.in \
    1212        autogen.sh
    1313
    1414if DOXYGEN
    1515
    16 docs: Doxyfile $(prefix)/docs/psmodule $(mandir)/man3
     16docs: Doxyfile $(prefix)/docs/psmodules $(mandir)/man3
    1717        doxygen Doxyfile
    18         mv -f $(prefix)/docs/psmodule/man/man3/* $(mandir)/man3
    19         rm -rf $(prefix)/docs/psmodule/man
     18        mv -f $(prefix)/docs/psmodules/man/man3/* $(mandir)/man3
     19        rm -rf $(prefix)/docs/psmodules/man
    2020
    21 $(prefix)/docs/psmodule:
    22         mkdir -p $(prefix)/docs/psmodule
     21$(prefix)/docs/psmodules:
     22        mkdir -p $(prefix)/docs/psmodules
    2323
    2424$(mandir)/man3:
    … …  
    2626
    2727uninstall-hook:
    28         rm -rf $(prefix)/docs/psmodule/*
     28        rm -rf $(prefix)/docs/psmodules/*
    2929
    30 CLEANFILES = $(prefix)/docs/psmodule/* *~
     30CLEANFILES = $(prefix)/docs/psmodules/* *~
    3131
    3232endif

  • trunk/psModules/autogen.sh

    r3858 r8569  
    88cd $srcdir
    99
    10 PROJECT=psmodule
     10PROJECT=psmodules
    1111TEST_TYPE=-f
    12 FILE=psmodule.pc.in
     12FILE=psmodules.pc.in
    1313
    1414DIE=0

  • trunk/psModules/configure.ac

    r7871 r8569  
    11AC_PREREQ(2.59)
    22
    3 AC_INIT([psmodule],[0.12.99],[http://pan-starrs.ifa.hawaii.edu/bugzilla])
    4 AC_CONFIG_SRCDIR([psmodule.pc.in])
     3AC_INIT([psmodules],[0.12.99],[http://pan-starrs.ifa.hawaii.edu/bugzilla])
     4AC_CONFIG_SRCDIR([psmodules.pc.in])
    55
    66AM_INIT_AUTOMAKE([1.7 foreign dist-bzip2])
    … …  
    5353SRCINC=`echo "${SRCDIRS=}" | ${PERL} -pe "s|(\w+)|-I\\\\${SRCPATH=}/\1|g"`
    5454SRCINC="-I${SRCPATH=} ${SRCINC=}"
    55 SRCSUBLIBS=`echo "${SRCDIRS=}" | ${PERL} -pe "s|(\w+)|\1/libpsmodule\1.la|g"`
     55SRCSUBLIBS=`echo "${SRCDIRS=}" | ${PERL} -pe "s|(\w+)|\1/libpsmodules\1.la|g"`
    5656AC_SUBST(SRCSUBLIBS,${SRCSUBLIBS=})
    5757AC_SUBST(SRCINC,${SRCINC=})
    … …  
    107107fi
    108108
    109 PSMODULE_CFLAGS="${PSMODULE_CFLAGS=} ${PSLIB_CFLAGS}"
    110 PSMODULE_LIBS="${PSMODULE_LIBS=} ${PSLIB_LIBS}"
     109PSMODULES_CFLAGS="${PSMODULES_CFLAGS=} ${PSLIB_CFLAGS}"
     110PSMODULES_LIBS="${PSMODULES_LIBS=} ${PSLIB_LIBS}"
    111111dnl ---------------------------------------------------------------------------
    112112
    113 AC_SUBST([PSMODULE_CFLAGS])
    114 AC_SUBST([PSMODULE_LIBS])
     113AC_SUBST([PSMODULES_CFLAGS])
     114AC_SUBST([PSMODULES_LIBS])
    115115
    116116AC_CONFIG_FILES([
    … …  
    133133  test/objects/Makefile
    134134  Doxyfile
    135   psmodule-config
    136   psmodule.pc
     135  psmodules-config
     136  psmodules.pc
    137137])
    138138

  • trunk/psModules/src/Makefile.am

    r7215 r8569  
    11SUBDIRS = $(SRCDIRS)
    2 lib_LTLIBRARIES = libpsmodule.la
     2lib_LTLIBRARIES = libpsmodules.la
    33
    4 libpsmodule_la_SOURCES = dummy.c
    5 libpsmodule_la_CPPFLAGS = $(SRCINC)
    6 libpsmodule_la_LIBADD = $(SRCSUBLIBS)
    7 libpsmodule_la_DEPENDENCIES = $(SRCSUBLIBS)
     4libpsmodules_la_SOURCES = dummy.c
     5libpsmodules_la_CPPFLAGS = $(SRCINC)
     6libpsmodules_la_LIBADD = $(SRCSUBLIBS)
     7libpsmodules_la_DEPENDENCIES = $(SRCSUBLIBS)
    88
    99include_HEADERS = \

  • trunk/psModules/src/astrom/Makefile.am

    r7215 r8569  
    1 noinst_LTLIBRARIES = libpsmoduleastrom.la
     1noinst_LTLIBRARIES = libpsmodulesastrom.la
    22
    3 libpsmoduleastrom_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS) -I../pslib/
    4 libpsmoduleastrom_la_LDFLAGS  = -release $(PACKAGE_VERSION)
    5 libpsmoduleastrom_la_SOURCES  = \
     3libpsmodulesastrom_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS) -I../pslib/
     4libpsmodulesastrom_la_LDFLAGS  = -release $(PACKAGE_VERSION)
     5libpsmodulesastrom_la_SOURCES  = \
    66        pmAstrometryObjects.c \
    77        pmAstrometryDistortion.c
    88
    9 psmoduleincludedir = $(includedir)
    10 psmoduleinclude_HEADERS = \
     9psmodulesincludedir = $(includedir)
     10psmodulesinclude_HEADERS = \
    1111        pmAstrometryObjects.h \
    1212        pmAstrometryDistortion.h

  • trunk/psModules/src/camera/Makefile.am

    r7589 r8569  
    1 noinst_LTLIBRARIES = libpsmodulecamera.la
     1noinst_LTLIBRARIES = libpsmodulescamera.la
    22
    3 libpsmodulecamera_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS)
    4 libpsmodulecamera_la_LDFLAGS  = -release $(PACKAGE_VERSION)
    5 libpsmodulecamera_la_SOURCES  = \
     3libpsmodulescamera_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS)
     4libpsmodulescamera_la_LDFLAGS  = -release $(PACKAGE_VERSION)
     5libpsmodulescamera_la_SOURCES  = \
    66        pmFPA.c \
    77        pmFPAConstruct.c \
    … …  
    2323        pmFPAfileFitsIO.c
    2424
    25 psmoduleincludedir = $(includedir)
    26 psmoduleinclude_HEADERS = \
     25psmodulesincludedir = $(includedir)
     26psmodulesinclude_HEADERS = \
    2727        pmFPA.h \
    2828        pmFPAConstruct.h \

  • trunk/psModules/src/concepts/Makefile.am

    r7849 r8569  
    1 noinst_LTLIBRARIES = libpsmoduleconcepts.la
     1noinst_LTLIBRARIES = libpsmodulesconcepts.la
    22
    3 libpsmoduleconcepts_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS)
    4 libpsmoduleconcepts_la_LDFLAGS  = -release $(PACKAGE_VERSION)
    5 libpsmoduleconcepts_la_SOURCES  = \
     3libpsmodulesconcepts_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS)
     4libpsmodulesconcepts_la_LDFLAGS  = -release $(PACKAGE_VERSION)
     5libpsmodulesconcepts_la_SOURCES  = \
    66        pmConcepts.c \
    77        pmConceptsAverage.c \
    … …  
    1111        pmConceptsPhotcode.c
    1212
    13 psmoduleincludedir = $(includedir)
    14 psmoduleinclude_HEADERS = \
     13psmodulesincludedir = $(includedir)
     14psmodulesinclude_HEADERS = \
    1515        pmConcepts.h \
    1616        pmConceptsAverage.h \

  • trunk/psModules/src/config/Makefile.am

    r7215 r8569  
    1 noinst_LTLIBRARIES = libpsmoduleconfig.la
     1noinst_LTLIBRARIES = libpsmodulesconfig.la
    22
    3 libpsmoduleconfig_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS)
    4 libpsmoduleconfig_la_LDFLAGS  = -release $(PACKAGE_VERSION)
    5 libpsmoduleconfig_la_SOURCES  = \
     3libpsmodulesconfig_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS)
     4libpsmodulesconfig_la_LDFLAGS  = -release $(PACKAGE_VERSION)
     5libpsmodulesconfig_la_SOURCES  = \
    66    pmConfig.c
    77
    8 psmoduleincludedir = $(includedir)
    9 psmoduleinclude_HEADERS = \
     8psmodulesincludedir = $(includedir)
     9psmodulesinclude_HEADERS = \
    1010    pmConfig.h
    1111

  • trunk/psModules/src/detrend/Makefile.am

    r7770 r8569  
    1 noinst_LTLIBRARIES = libpsmoduledetrend.la
     1noinst_LTLIBRARIES = libpsmodulesdetrend.la
    22
    3 libpsmoduledetrend_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS)
    4 libpsmoduledetrend_la_LDFLAGS  = -release $(PACKAGE_VERSION)
    5 libpsmoduledetrend_la_SOURCES  = \
     3libpsmodulesdetrend_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS)
     4libpsmodulesdetrend_la_LDFLAGS  = -release $(PACKAGE_VERSION)
     5libpsmodulesdetrend_la_SOURCES  = \
    66        pmFlatField.c \
    77        pmFlatNormalize.c \
    … …  
    1616#       pmSubtractSky.c
    1717
    18 psmoduleincludedir = $(includedir)
    19 psmoduleinclude_HEADERS = \
     18psmodulesincludedir = $(includedir)
     19psmodulesinclude_HEADERS = \
    2020        pmFlatField.h \
    2121        pmFlatFieldErrors.h \

  • trunk/psModules/src/imcombine/Makefile.am

    r7215 r8569  
    1 noinst_LTLIBRARIES = libpsmoduleimcombine.la
     1noinst_LTLIBRARIES = libpsmodulesimcombine.la
    22
    3 libpsmoduleimcombine_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS)
    4 libpsmoduleimcombine_la_LDFLAGS  = -release $(PACKAGE_VERSION)
     3libpsmodulesimcombine_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS)
     4libpsmodulesimcombine_la_LDFLAGS  = -release $(PACKAGE_VERSION)
    55
    6 libpsmoduleimcombine_la_SOURCES  = \
     6libpsmodulesimcombine_la_SOURCES  = \
    77     pmImageCombine.c \
    88     pmImageSubtract.c \
    99     pmReadoutCombine.c
    1010
    11 psmoduleincludedir = $(includedir)
    12 psmoduleinclude_HEADERS = \
     11psmodulesincludedir = $(includedir)
     12psmodulesinclude_HEADERS = \
    1313    pmImageCombine.h \
    1414    pmImageSubtract.h \

  • trunk/psModules/src/mainpage.dox

    r5710 r8569  
    1 /** @mainpage psModule Image Processing Library
     1/** @mainpage psModules Image Processing Library
    22
    33
    44@section intro Introduction
    5 This library contains the Pan-STARRS Image Processing Pipeline (IPP) modules (psModule). These modules
     5This library contains the Pan-STARRS Image Processing Pipeline (IPP) modules (psModules). These modules
    66use the functionality of the Pan-STARRS Library (psLib) to perform more complex tasks associated with image
    77processing. Modules were constructed to support each of the required processing stages and are listed according
    … …  
    99structures and functions are prefixed with pm, an abbreviation for Pan-STARRS Modules.
    1010
    11 The capabilities provided by psModule are grouped into the following areas which are
     11The capabilities provided by psModules are grouped into the following areas which are
    1212also reflected in the file system directory structure:
    1313 - Configuration
    … …  
    1919 - Image Subtraction
    2020
    21 The installed code for psModule consists of header files and a binary library.
     21The installed code for psModules consists of header files and a binary library.
    2222
    2323@section extinstall Required external Libraries
    … …  
    3737We recommend using the particular versions listed as compatibility tested, as
    3838that is the only versions of the external libraries tested to work well with psLib
    39 and psModule.  Though it is quite possible that later versions of the libraries
     39and psModules.  Though it is quite possible that later versions of the libraries
    4040listed will also work, care must be taken when upgrading these libraries to verify
    4141that its functionality is compatible with the tested version.
    … …  
    4343@section install How to Build from Source
    4444
    45 Tested versions of psModule are put into a tar file and can be downloaded from:
     45Tested versions of psModules are put into a tar file and can be downloaded from:
    4646
    4747https://mhpcc.pan-starrs.org/code/releases
    … …  
    5858
    5959
    60 @section build How to Build and Test the psModule Library.
     60@section build How to Build and Test the psModules Library.
    6161
    62 The psModule library and associated tests are made via the GNU autoconf/automake system.
     62The psModules library and associated tests are made via the GNU autoconf/automake system.
    6363
    64 The source should build using the configure script in the psModule directory.  The
     64The source should build using the configure script in the psModules directory.  The
    6565recommended steps are:
    6666<pre>
    67 $ cd psModule
     67$ cd psmodules
    6868$ ./configure
    6969$ make
    … …  
    7777
    7878Other configuration options, such as location of external libraries, are also available.
    79 To get a list of options, type the following in the top psModule directory.
     79To get a list of options, type the following in the top psModules directory.
    8080<pre>
    8181$ configure --help
    … …  
    9494
    9595
    96 @section usage Building and Linking your code to the psModule library
     96@section usage Building and Linking your code to the psModules library
    9797
    9898To assist the use of the library with your own code, a configuration tool is part
    99 of the psModule library package.  This tool, psmodule-config, is installed in the BIN
     99of the psModules library package.  This tool, psmodules-config, is installed in the BIN
    100100directory, according to the options given to the configure script.
    101101
    102 The required CFLAG options for the compiler stage of code that uses psModule can be
    103 obtained via 'psmodule-config --cflags'.  This outputs the cc options that supplies
    104 include path(s) required to find the psModule headers.
     102The required CFLAG options for the compiler stage of code that uses psModules can be
     103obtained via 'psmodules-config --cflags'.  This outputs the cc options that supplies
     104include path(s) required to find the psModules headers.
    105105
    106 The required linking options, can be obtained via 'psmodule-config --libs'.  This
     106The required linking options, can be obtained via 'psmodules-config --libs'.  This
    107107outputs the ld options that supplies the library paths and files required to
    108 link to the psModule library.
     108link to the psModules library.
    109109
    110 Note: psmodule-config usage above refers to the install locations of the library. 
     110Note: psmodules-config usage above refers to the install locations of the library. 
    111111
    112112@section doc How to Create Code Documentation
    … …  
    115115documentation embedded in the code using the following commands:
    116116<pre>
    117 $ cd psModule
     117$ cd psmodules
    118118$ make docs
    119119</pre>

  • trunk/psModules/src/objects/Makefile.am

    r7215 r8569  
    1 noinst_LTLIBRARIES = libpsmoduleobjects.la
     1noinst_LTLIBRARIES = libpsmodulesobjects.la
    22
    3 libpsmoduleobjects_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS) -I../pslib/
    4 libpsmoduleobjects_la_LDFLAGS  = -release $(PACKAGE_VERSION)
    5 libpsmoduleobjects_la_SOURCES  = \
     3libpsmodulesobjects_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS) -I../pslib/
     4libpsmodulesobjects_la_LDFLAGS  = -release $(PACKAGE_VERSION)
     5libpsmodulesobjects_la_SOURCES  = \
    66     pmPeaks.c \
    77     pmMoments.c \
    … …  
    3030        models/pmModel_SGAUSS.c
    3131
    32 psmoduleincludedir = $(includedir)
    33 psmoduleinclude_HEADERS = \
     32psmodulesincludedir = $(includedir)
     33psmodulesinclude_HEADERS = \
    3434     pmPeaks.h \
    3535     pmMoments.h \

  • trunk/psModules/test/Makefile.am

    r7215 r8569  
    1 # Makefile for psModule tests
    2 
    31SUBDIRS = $(SRCDIRS)
    42

  • trunk/psModules/test/astrom/Makefile.am

    r7215 r8569  
    1 # Makefile for psModule tests
    2 
    3 AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
    4 AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
     1AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
     2AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
    53AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
    64

  • trunk/psModules/test/camera/Makefile.am

    r7215 r8569  
    1 # Makefile for psModule tests
    2 
    3 AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
    4 AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
     1AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
     2AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
    53AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
    64

  • trunk/psModules/test/concepts/Makefile.am

    r7215 r8569  
    1 # Makefile for psModule tests
    2 
    3 AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
    4 AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
     1AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
     2AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
    53AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
    64

  • trunk/psModules/test/config/Makefile.am

    r7215 r8569  
    1 # Makefile for psModule tests
    2 
    3 AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
    4 AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
     1AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
     2AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
    53
    64TESTS = \

  • trunk/psModules/test/detrend/Makefile.am

    r7212 r8569  
    1 # Makefile for psModule tests
    2 
    3 AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
    4 AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
     1AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
     2AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
    53AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
    64

  • trunk/psModules/test/imcombine/Makefile.am

    r7212 r8569  
    1 # Makefile for psModule tests
    2 
    3 AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
    4 AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
     1AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
     2AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
    53
    64TESTS = \

  • trunk/psModules/test/objects/Makefile.am

    r7215 r8569  
    1 # Makefile for psModule tests
    2 
    3 AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
    4 AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
     1AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
     2AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
    53
    64TESTS = \

  • trunk/psModules/test/pslib/Makefile.am

    r7215 r8569  
    1 # Makefile for psModule tests
    2 
    3 AM_LDFLAGS = -L$(top_builddir)/src -lpsmodule $(PSMODULE_LIBS)
    4 AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULE_CFLAGS) $(SRCINC)
     1AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
     2AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
    53
    64TESTS =
Note: See TracChangeset for help on using the changeset viewer.