IPP Software

Navigation

Tools

IPP Links

Communication

Pan-STARRS Links

Context Navigation

← Previous Change
Next Change →

Changeset 32630 for branches/eam_branches/ipp-20110906/psvideophot/src/Makefile.am

Timestamp:

Nov 8, 2011, 2:44:12 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110906

Files:

: 3 edited

. (modified) (1 prop)
psvideophot (modified) (1 prop)
psvideophot/src/Makefile.am (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/eam_branches/ipp-20110906

Property svn:mergeinfo changed

/trunk (added)

merged: 32364,32366-32375,32379-32381,32383,32385,32387,32390,32392,32394,32396,32402-32404,32406,32408-32409,32411,32413,32415,32417,32419-32423,32426,32428,32430,32432,32434-32437,32442-32447,32449,32451-32469,32471,32473-32474,32477,32479-32483,32485,32487,32489-32497,32499-32502,32504,32506-32513,32515-32521,32524,32528-32529,32532,32534,32536-32537,32539-32544,32546-32547,32549,32551,32553-32554,32556-32557,32559,32562-32565,32567,32570,32573,32575,32577-32582,32586-32594,32596-32597,32600-32602,32604,32609,32615,32622-32625

branches/eam_branches/ipp-20110906/psvideophot
- Property svn:mergeinfo changed
  /trunk/psvideophot (added) merged: 32553,32556

branches/eam_branches/ipp-20110906/psvideophot/src/Makefile.am

-              r31713
+              r32630
+bin_PROGRAMS = psvideophot
+bin_PROGRAMS =  psvideophot \
+                dumpvideo
 noinst_HEADERS = \
 …
         psvideophotVersion.c
+dumpvideo_CFLAGS = $(PSVIDEOPHOT_CFLAGS) $(PPSTATS_CFLAGS) $(PSASTRO_CFLAGS) $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
+dumpvideo_LDFLAGS = $(PSVIDEOPHOT_LIBS) $(PSASTRO_LIBS) $(PPSTATS_LIBS) $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
+dumpvideo_SOURCES = \
+        dumpvideo.c
 CLEANFILES = *~

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: