Rename tools/vtview_hotplug.c

Signed-off-by: Yi Sun <yi.sun@intel.com>

3 files changed, 19 insertions, 18 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 290f670..1e09666 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -37,7 +37,7 @@ host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.sources
 noinst_PROGRAMS = $(am__EXEEXT_1)
-@BUILD_TESTS_TRUE@EXTRA_PROGRAMS = $(am__EXEEXT_1)
+EXTRA_PROGRAMS =
 subdir = tools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \
@@ -52,7 +52,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__EXEEXT_1 = vtview$(EXEEXT) QRdecode4Display$(EXEEXT)
+am__EXEEXT_1 = VTview$(EXEEXT) QRdecode4Display$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 am_QRdecode4Display_OBJECTS = QRdecode4Display.$(OBJEXT)
 QRdecode4Display_OBJECTS = $(am_QRdecode4Display_OBJECTS)
@@ -67,10 +67,10 @@ am__DEPENDENCIES_1 =
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
-vtview_SOURCES = vtview.c
-vtview_OBJECTS = vtview.$(OBJEXT)
-vtview_LDADD = $(LDADD)
-@BUILD_TESTS_TRUE@vtview_DEPENDENCIES = ../lib/libintel_tools.la \
+am_VTview_OBJECTS = vtview.$(OBJEXT) testdisplay_hotplug.$(OBJEXT)
+VTview_OBJECTS = $(am_VTview_OBJECTS)
+VTview_LDADD = $(LDADD)
+@BUILD_TESTS_TRUE@VTview_DEPENDENCIES = ../lib/libintel_tools.la \
 @BUILD_TESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 @BUILD_TESTS_TRUE@	../lib/libdecodeqr.so $(am__DEPENDENCIES_1) \
 @BUILD_TESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -117,8 +117,8 @@ am__v_CXXLD_0 = @echo "  CXXLD " $@;
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(QRdecode4Display_SOURCES) vtview.c
-DIST_SOURCES = $(QRdecode4Display_SOURCES) vtview.c
+SOURCES = $(QRdecode4Display_SOURCES) $(VTview_SOURCES)
+DIST_SOURCES = $(QRdecode4Display_SOURCES) $(VTview_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -313,9 +313,9 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-TESTS_progs = $(NULL) vtview QRdecode4Display
+TOOLS_progs = $(NULL) VTview QRdecode4Display
 IMAGES = pass.png 1080p-left.png 1080p-right.png
-testdisplay_SOURCES = \
+VTview_SOURCES = \
 	vtview.c \
 	vtview.h \
 	testdisplay_hotplug.c \
@@ -384,9 +384,9 @@ clean-noinstPROGRAMS:
 QRdecode4Display$(EXEEXT): $(QRdecode4Display_OBJECTS) $(QRdecode4Display_DEPENDENCIES) 
 	@rm -f QRdecode4Display$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(QRdecode4Display_OBJECTS) $(QRdecode4Display_LDADD) $(LIBS)
-vtview$(EXEEXT): $(vtview_OBJECTS) $(vtview_DEPENDENCIES) 
-	@rm -f vtview$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(vtview_OBJECTS) $(vtview_LDADD) $(LIBS)
+VTview$(EXEEXT): $(VTview_OBJECTS) $(VTview_DEPENDENCIES) 
+	@rm -f VTview$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(VTview_OBJECTS) $(VTview_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -395,6 +395,7 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QRdecode4Display.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdisplay_hotplug.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtview.Po@am__quote@
 
 .c.o:
diff --git a/tools/Makefile.sources b/tools/Makefile.sources
index 37b4d1a..ddff71e 100644
--- a/tools/Makefile.sources
+++ b/tools/Makefile.sources
@@ -1,13 +1,13 @@
 noinst_PROGRAMS = \
-	$(TESTS_progs) \
+	$(TOOLS_progs) \
 	$(NULL)
 
-TESTS_progs = \
+TOOLS_progs = \
 	$(NULL)
 
 IMAGES = pass.png 1080p-left.png 1080p-right.png
 
-testdisplay_SOURCES = \
+VTview_SOURCES = \
 	vtview.c \
 	vtview.h \
 	testdisplay_hotplug.c \
@@ -16,4 +16,4 @@ testdisplay_SOURCES = \
 QRdecode4Display_SOURCES = QRdecode4Display.cpp \
 	${NULL}
 
-TESTS_progs += vtview QRdecode4Display
+TOOLS_progs += VTview QRdecode4Display
diff --git a/tools/testdisplay_hotplug.c b/tools/vtview_hotplug.c
index 6e33ef3..26efce3 100644
--- a/tools/testdisplay_hotplug.c
+++ b/tools/vtview_hotplug.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "testdisplay.h"
+#include "vtview.h"
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif