IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 29948


Ignore:
Timestamp:
Dec 6, 2010, 10:44:44 AM (15 years ago)
Author:
heather
Message:

oops. ppImage was accidentall psvideophot

Location:
branches/haf_branches/videophot2010/ppImage
Files:
13 deleted
3 edited
44 copied

Legend:

Unmodified
Added
Removed

  • branches/haf_branches/videophot2010/ppImage/autogen.sh

    r29947 r29948  
    88cd $srcdir
    99
    10 PROJECT=psvideophot
     10PROJECT=ppImage
    1111TEST_TYPE=-f
    1212# change this to be a unique filename in the top level dir

  • branches/haf_branches/videophot2010/ppImage/configure.ac

    r29947 r29948  
    11AC_PREREQ(2.61)
    22
    3 AC_INIT([psvideophot], [1.1.0], [ipp-support@ifa.hawaii.edu])
     3AC_INIT([ppImage], [1.1.0], [ipp-support@ifa.hawaii.edu])
    44AC_CONFIG_SRCDIR([src])
    55
    … …  
    2828IPP_VERSION
    2929
    30 AC_SUBST([PSVIDEOPHOT_CFLAGS])
    31 AC_SUBST([PSVIDEOPHOT_LIBS])
     30AC_SUBST([PPIMAGE_CFLAGS])
     31AC_SUBST([PPIMAGE_LIBS])
    3232
    3333AC_CONFIG_FILES([

  • branches/haf_branches/videophot2010/ppImage/src/Makefile.am

    r29947 r29948  
    1 bin_PROGRAMS = psvideophot
     1bin_PROGRAMS = ppImage
    22
    33noinst_HEADERS = \
    4         psvideophot.h
     4        ppImage.h
    55
    66if HAVE_SVNVERSION
    7 PSVIDEOPHOT_VERSION=`$(SVNVERSION) ..`
     7PPIMAGE_VERSION=`$(SVNVERSION) ..`
    88else
    9 PSVIDEOPHOT_VERSION="UNKNOWN"
     9PPIMAGE_VERSION="UNKNOWN"
    1010endif
    1111
    1212if HAVE_SVN
    13 PSVIDEOPHOT_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    14 PSVIDEOPHOT_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
     13PPIMAGE_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
     14PPIMAGE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    1515else
    16 PSVIDEOPHOT_BRANCH="UNKNOWN"
    17 PSVIDEOPHOT_SOURCE="UNKNOWN"
     16PPIMAGE_BRANCH="UNKNOWN"
     17PPIMAGE_SOURCE="UNKNOWN"
    1818endif
    1919
    20 # Force recompilation of psvideophotVersion.c, since it gets the version information
    21 psvideophotVersion.c: psvideophotVersionDefinitions.h
    22 psvideophotVersionDefinitions.h: psvideophotVersionDefinitions.h.in FORCE
    23         -$(RM) psvideophotVersionDefinitions.h
    24         $(SED) -e "s|@PSVIDEOPHOT_VERSION@|\"$(PSVIDEOPHOT_VERSION)\"|" -e "s|@PSVIDEOPHOT_BRANCH@|\"$(PSVIDEOPHOT_BRANCH)\"|" -e "s|@PSVIDEOPHOT_SOURCE@|\"$(PSVIDEOPHOT_SOURCE)\"|" psvideophotVersionDefinitions.h.in > psvideophotVersionDefinitions.h
     20# Force recompilation of ppImageVersion.c, since it gets the version information
     21ppImageVersion.c: ppImageVersionDefinitions.h
     22ppImageVersionDefinitions.h: ppImageVersionDefinitions.h.in FORCE
     23        -$(RM) ppImageVersionDefinitions.h
     24        $(SED) -e "s|@PPIMAGE_VERSION@|\"$(PPIMAGE_VERSION)\"|" -e "s|@PPIMAGE_BRANCH@|\"$(PPIMAGE_BRANCH)\"|" -e "s|@PPIMAGE_SOURCE@|\"$(PPIMAGE_SOURCE)\"|" ppImageVersionDefinitions.h.in > ppImageVersionDefinitions.h
    2525FORCE: ;
    2626
    27 BUILT_SOURCES = psvideophotVersionDefinitions.h
     27BUILT_SOURCES = ppImageVersionDefinitions.h
    2828
    29 psvideophot_CFLAGS = $(PSVIDEOPHOT_CFLAGS) $(PPSTATS_CFLAGS) $(PSASTRO_CFLAGS) $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
    30 psvideophot_LDFLAGS = $(PSVIDEOPHOT_LIBS) $(PSASTRO_LIBS) $(PPSTATS_LIBS) $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
    31 psvideophot_SOURCES = \
    32         psvideophot.c \
    33         psvideophotArguments.c \
    34         psvideophotParseCamera.c \
    35         psvideophotOptions.c \
    36         psvideophotCleanup.c \
    37         psvideophotDefineFile.c \
    38         psvideoLoop.c \
    39         psvideophotFileCheck.c \
    40         psvideophotVersion.c
     29ppImage_CFLAGS = $(PPIMAGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSASTRO_CFLAGS) $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
     30ppImage_LDFLAGS = $(PPIMAGE_LIBS) $(PSASTRO_LIBS) $(PPSTATS_LIBS) $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
     31ppImage_SOURCES = \
     32        ppImage.c \
     33        ppImageArguments.c \
     34        ppImageParseCamera.c \
     35        ppImageLoop.c \
     36        ppImageCleanup.c \
     37        ppImageOptions.c \
     38        ppImageDetrendReadout.c \
     39        ppImageDetrendRecord.c \
     40        ppImageDetrendNonLinear.c \
     41        ppImageDetrendFringe.c \
     42        ppImageDetrendFree.c \
     43        ppImageDetrendPattern.c \
     44        ppImageRebinReadout.c \
     45        ppImageMosaic.c \
     46        ppImageMaskStats.c \
     47        ppImagePhotom.c \
     48        ppImageAstrom.c \
     49        ppImageAddstar.c \
     50        ppImageStatsOutput.c \
     51        ppImagePixelStats.c \
     52        ppImageMetadataStats.c \
     53        ppImageReplaceBackground.c \
     54        ppImageMeasureCrosstalk.c \
     55        ppImageCorrectCrosstalk.c \
     56        ppImageDefineFile.c \
     57        ppImageSetMaskBits.c \
     58        ppImageBurntoolMask.c \
     59        ppImageParityFlip.c \
     60        ppImageCheckCTE.c \
     61        ppImageFileCheck.c \
     62        ppImageVersion.c \
     63        ppImageMemory.c
    4164
    4265CLEANFILES = *~
Note: See TracChangeset for help on using the changeset viewer.