Changeset 36536 for branches/eam_branches/ipp-20140206/ippTools/src

Timestamp:

Feb 18, 2014, 2:53:55 PM (12 years ago)

Author:

eugene

Message:

merge from trunk

Location:

branches/eam_branches/ipp-20140206

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/Makefile.am (modified) (3 diffs)
• ippTools/src/camtool.c (modified) (1 prop)
• ippTools/src/camtoolConfig.c (modified) (1 prop)
• ippTools/src/magictool.c (modified) (1 prop)
• ippTools/src/remotetool.c (copied) (copied from trunk/ippTools/src/remotetool.c )
• ippTools/src/remotetool.h (copied) (copied from trunk/ippTools/src/remotetool.h )
• ippTools/src/remotetoolConfig.c (copied) (copied from trunk/ippTools/src/remotetoolConfig.c )

branches/eam_branches/ipp-20140206/ippTools/src/Makefile.am

@@ -34 +34 @@
         sctool \
         releasetool \
-        fftool
+        fftool \
+        remotetool
 
 pkginclude_HEADERS = \
@@ -89 +90 @@
         sctool.h \
         releasetool.h \
-        fftool.h
+        fftool.h \
+        remotetool.h 
 
 lib_LTLIBRARIES = libpxtools.la
@@ -340 +342 @@
     fftoolConfig.c
 
+remotetool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+remotetool_LDADD  = $(PSLIB_LIBS)   $(PSMODULES_LIBS)   $(IPPDB_LIBS)   libpxtools.la
+remotetool_SOURCES = \
+    remotetool.c \
+    remotetoolConfig.c
+
 clean-local:
         -rm -f TAGS