Changeset 29947
- Timestamp:
- Dec 6, 2010, 10:33:27 AM (15 years ago)
- Location:
- branches/haf_branches/videophot2010/ppImage
- Files:
-
- 13 added
- 44 deleted
- 3 edited
-
autogen.sh (modified) (1 diff)
-
configure.ac (modified) (2 diffs)
-
src/Makefile.am (modified) (1 diff)
-
src/ppFocus.c (deleted)
-
src/ppFocusArguments.c (deleted)
-
src/ppFocusFitFWHM.c (deleted)
-
src/ppFocusGetFWHM.c (deleted)
-
src/ppFocusParseCamera.c (deleted)
-
src/ppImage.c (deleted)
-
src/ppImage.h (deleted)
-
src/ppImageAddstar.c (deleted)
-
src/ppImageArguments.c (deleted)
-
src/ppImageAstrom.c (deleted)
-
src/ppImageBurntoolMask.c (deleted)
-
src/ppImageCheckCTE.c (deleted)
-
src/ppImageCheckCTE.v1.c (deleted)
-
src/ppImageCleanup.c (deleted)
-
src/ppImageCorrectCrosstalk.c (deleted)
-
src/ppImageDefineFile.c (deleted)
-
src/ppImageDetrendFree.c (deleted)
-
src/ppImageDetrendFringe.c (deleted)
-
src/ppImageDetrendNonLinear.c (deleted)
-
src/ppImageDetrendPattern.c (deleted)
-
src/ppImageDetrendReadout.c (deleted)
-
src/ppImageDetrendRecord.c (deleted)
-
src/ppImageErrorCodes.c.in (deleted)
-
src/ppImageErrorCodes.dat (deleted)
-
src/ppImageErrorCodes.h.in (deleted)
-
src/ppImageFileCheck.c (deleted)
-
src/ppImageLoop.c (deleted)
-
src/ppImageMaskStats.c (deleted)
-
src/ppImageMeasureCrosstalk.c (deleted)
-
src/ppImageMemory.c (deleted)
-
src/ppImageMetadataStats.c (deleted)
-
src/ppImageMosaic.c (deleted)
-
src/ppImageOptions.c (deleted)
-
src/ppImageParityFlip.c (deleted)
-
src/ppImageParseCamera.c (deleted)
-
src/ppImagePhotom.c (deleted)
-
src/ppImagePixelStats.c (deleted)
-
src/ppImageRebinReadout.c (deleted)
-
src/ppImageReplaceBackground.c (deleted)
-
src/ppImageSetMaskBits.c (deleted)
-
src/ppImageSetThreads.c (deleted)
-
src/ppImageStatsOutput.c (deleted)
-
src/ppImageVersion.c (deleted)
-
src/ppImageVersionDefinitions.h.in (deleted)
-
src/psvideoLoop.c (added)
-
src/psvideophot (added)
-
src/psvideophot.c (added)
-
src/psvideophot.h (added)
-
src/psvideophotArguments.c (added)
-
src/psvideophotCleanup.c (added)
-
src/psvideophotDefineFile.c (added)
-
src/psvideophotFileCheck.c (added)
-
src/psvideophotOptions.c (added)
-
src/psvideophotParseCamera.c (added)
-
src/psvideophotVersion.c (added)
-
src/psvideophotVersionDefinitions.h (added)
-
src/psvideophotVersionDefinitions.h.in (added)
Legend:
- Unmodified
- Added
- Removed
-
branches/haf_branches/videophot2010/ppImage/autogen.sh
r19244 r29947 8 8 cd $srcdir 9 9 10 PROJECT=p pImage10 PROJECT=psvideophot 11 11 TEST_TYPE=-f 12 12 # change this to be a unique filename in the top level dir -
branches/haf_branches/videophot2010/ppImage/configure.ac
r23796 r29947 1 1 AC_PREREQ(2.61) 2 2 3 AC_INIT([p pImage], [1.1.0], [ipp-support@ifa.hawaii.edu])3 AC_INIT([psvideophot], [1.1.0], [ipp-support@ifa.hawaii.edu]) 4 4 AC_CONFIG_SRCDIR([src]) 5 5 … … 28 28 IPP_VERSION 29 29 30 AC_SUBST([P PIMAGE_CFLAGS])31 AC_SUBST([P PIMAGE_LIBS])30 AC_SUBST([PSVIDEOPHOT_CFLAGS]) 31 AC_SUBST([PSVIDEOPHOT_LIBS]) 32 32 33 33 AC_CONFIG_FILES([ -
branches/haf_branches/videophot2010/ppImage/src/Makefile.am
r28043 r29947 1 bin_PROGRAMS = p pImage1 bin_PROGRAMS = psvideophot 2 2 3 3 noinst_HEADERS = \ 4 p pImage.h4 psvideophot.h 5 5 6 6 if HAVE_SVNVERSION 7 P PIMAGE_VERSION=`$(SVNVERSION) ..`7 PSVIDEOPHOT_VERSION=`$(SVNVERSION) ..` 8 8 else 9 P PIMAGE_VERSION="UNKNOWN"9 PSVIDEOPHOT_VERSION="UNKNOWN" 10 10 endif 11 11 12 12 if HAVE_SVN 13 P PIMAGE_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 P PIMAGE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`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'` 15 15 else 16 P PIMAGE_BRANCH="UNKNOWN"17 P PIMAGE_SOURCE="UNKNOWN"16 PSVIDEOPHOT_BRANCH="UNKNOWN" 17 PSVIDEOPHOT_SOURCE="UNKNOWN" 18 18 endif 19 19 20 # Force recompilation of p pImageVersion.c, since it gets the version information21 p pImageVersion.c: ppImageVersionDefinitions.h22 p pImageVersionDefinitions.h: ppImageVersionDefinitions.h.in FORCE23 -$(RM) p pImageVersionDefinitions.h24 $(SED) -e "s|@P PIMAGE_VERSION@|\"$(PPIMAGE_VERSION)\"|" -e "s|@PPIMAGE_BRANCH@|\"$(PPIMAGE_BRANCH)\"|" -e "s|@PPIMAGE_SOURCE@|\"$(PPIMAGE_SOURCE)\"|" ppImageVersionDefinitions.h.in > ppImageVersionDefinitions.h20 # 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 25 25 FORCE: ; 26 26 27 BUILT_SOURCES = p pImageVersionDefinitions.h27 BUILT_SOURCES = psvideophotVersionDefinitions.h 28 28 29 ppImage_CFLAGS = $(PPIMAGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSASTRO_CFLAGS) $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) 30 ppImage_LDFLAGS = $(PPIMAGE_LIBS) $(PSASTRO_LIBS) $(PPSTATS_LIBS) $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS) 31 ppImage_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 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 64 41 65 42 CLEANFILES = *~
Note:
See TracChangeset
for help on using the changeset viewer.
