Context Navigation

← Previous Change
Next Change →

Makefile.am

Timestamp:

Feb 8, 2023, 12:14:39 PM (3 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20220316. add safety to pxadmin to prevent drop of ops dbs, add fpcamera, more flexibility in ippadmin for testing; prevent pzgetexp from trying to download too many exposures

Location:

trunk/ippTools

Files:

: 3 edited

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

Legend:

: Unmodified
: Added
: Removed

trunk/ippTools
- Property svn:mergeinfo changed
  /branches/eam_branches/ipp-20220316/ippTools (added) merged: 42166,42193,42195-42197,42205-42207,42213,42258,42367

trunk/ippTools/src

Property svn:ignore

old	new
49	49	fftool
50	50	remotetool
51
	51	fpcamtool

Property svn:mergeinfo changed
/branches/eam_branches/ipp-20220316/ippTools/src (added) merged: 42166,42195-42197,42205,42207,42258,42367

trunk/ippTools/src/Makefile.am

-              r36511
+              r42387
         releasetool \
         fftool \
+        fpcamtool \
         remotetool
 …
         pxtoolsErrorCodes.h \
         pxtree.h \
+        pxfpcam.h \
         pxwarp.h
 …
         releasetool.h \
         fftool.h \
+        fpcamtool.h \
         remotetool.h
 …
         pxtoolsErrorCodes.c \
         pxtree.c \
+        pxfpcam.c \
         pxwarp.c
 …
     camtool.c \
     camtoolConfig.c
+fpcamtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+fpcamtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+fpcamtool_SOURCES = \
+    fpcamtool.c \
+    fpcamtoolConfig.c
 faketool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)

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