Remove "upnp_" prefix from samples.

.gitignore

@@ -98,9 +98,9 @@ m4/lt~obsolete.m4
 stamp-h1
 upnp/inc/stamp-h2
 upnp/inc/upnpconfig.h
-upnp/sample/upnp_tv_combo
-upnp/sample/upnp_tv_ctrlpt
-upnp/sample/upnp_tv_device
+upnp/sample/tv_combo
+upnp/sample/tv_ctrlpt
+upnp/sample/tv_device
 upnp/unittest/unittest
 upnp/unittest/*.pp.c
 docs/doxygen

upnp/sample/Makefile.am

@@ -19,21 +19,21 @@ LDADD = \
 noinst_PROGRAMS =
 if ENABLE_SAMPLES
 if ENABLE_CLIENT
-noinst_PROGRAMS += upnp_tv_ctrlpt
-upnp_tv_ctrlpt_CPPFLAGS = \
+noinst_PROGRAMS += tv_ctrlpt
+tv_ctrlpt_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(srcdir)/common/ \
 	-I$(srcdir)/tvctrlpt
 if ENABLE_DEVICE
-noinst_PROGRAMS += upnp_tv_combo
-upnp_tv_combo_CPPFLAGS = $(AM_CPPFLAGS) \
+noinst_PROGRAMS += tv_combo
+tv_combo_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(srcdir)/common/ \
 	-I$(srcdir)/tvcombo
 endif
 endif
 if ENABLE_DEVICE
-noinst_PROGRAMS += upnp_tv_device
-upnp_tv_device_CPPFLAGS = \
+noinst_PROGRAMS += tv_device
+tv_device_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(srcdir)/common/ \
 	-I$(srcdir)/tvdevice
@@ -41,37 +41,37 @@ endif
 endif
 
 
-upnp_tv_device_SOURCES = \
+tv_device_SOURCES = \
 	common/sample_util.c \
 	common/sample_util.h \
-	tvdevice/upnp_tv_device.c \
-	tvdevice/upnp_tv_device.h \
-	tvdevice/linux/upnp_tv_device_main.c
+	tvdevice/tv_device.c \
+	tvdevice/tv_device.h \
+	tvdevice/linux/tv_device_main.c
 
 
-upnp_tv_ctrlpt_SOURCES = \
+tv_ctrlpt_SOURCES = \
 	common/sample_util.c \
 	common/sample_util.h \
-	tvctrlpt/upnp_tv_ctrlpt.c \
-	tvctrlpt/upnp_tv_ctrlpt.h \
-	tvctrlpt/linux/upnp_tv_ctrlpt_main.c
+	tvctrlpt/tv_ctrlpt.c \
+	tvctrlpt/tv_ctrlpt.h \
+	tvctrlpt/linux/tv_ctrlpt_main.c
 
-upnp_tv_combo_SOURCES = \
+tv_combo_SOURCES = \
 	common/sample_util.c \
 	common/sample_util.h \
-	tvcombo/upnp_tv_ctrlpt.c \
-	tvcombo/upnp_tv_ctrlpt.h \
-	tvcombo/upnp_tv_device.c \
-	tvcombo/upnp_tv_device.h \
-	tvcombo/linux/upnp_tv_combo_main.c
+	tvcombo/tv_ctrlpt.c \
+	tvcombo/tv_ctrlpt.h \
+	tvcombo/tv_device.c \
+	tvcombo/tv_device.h \
+	tvcombo/linux/tv_combo_main.c
 
 
 if WITH_DOCUMENTATION
 examplesdir = $(docdir)/examples
 examples_DATA = \
 		$(sort \
-			$(upnp_tv_ctrlpt_SOURCES) \
-			$(upnp_tv_device_SOURCES))
+			$(tv_ctrlpt_SOURCES) \
+			$(tv_device_SOURCES))
 endif
 
 

upnp/sample/tvcombo/linux/tv_combo_main.c

@@ -30,8 +30,8 @@
  ******************************************************************************/
 
 #include "sample_util.h"
-#include "upnp_tv_ctrlpt.h"
-#include "upnp_tv_device.h"
+#include "tv_ctrlpt.h"
+#include "tv_device.h"
 
 #include <stdarg.h>
 #include <stdio.h>

upnp/sample/tvcombo/tv_ctrlpt.c

@@ -30,7 +30,7 @@
  ******************************************************************************/
 
 
-#include "upnp_tv_ctrlpt.h"
+#include "tv_ctrlpt.h"
 
 
 #include "upnp.h"

upnp/sample/tvcombo/tv_device.c

@@ -29,7 +29,7 @@
  *
  ******************************************************************************/
 
-#include "upnp_tv_device.h"
+#include "tv_device.h"
 
 #include <assert.h>
 

upnp/sample/tvctrlpt/linux/tv_ctrlpt_main.c

@@ -30,7 +30,7 @@
  ******************************************************************************/
 
 #include "sample_util.h"
-#include "upnp_tv_ctrlpt.h"
+#include "tv_ctrlpt.h"
 
 #include <stdarg.h>
 #include <stdio.h>

upnp/sample/tvctrlpt/tv_ctrlpt.c

@@ -29,13 +29,10 @@
  *
  ******************************************************************************/
 
-
-#include "upnp_tv_ctrlpt.h"
-
+#include "tv_ctrlpt.h"
 
 #include "upnp.h"
 
-
 /*!
    Mutex for protecting the global device list
    in a multi-threaded, asynchronous environment.

upnp/sample/tvdevice/linux/tv_device_main.c

@@ -31,7 +31,7 @@
 
 
 #include "sample_util.h"
-#include "upnp_tv_device.h"
+#include "tv_device.h"
 
 
 #include <stdarg.h>

upnp/sample/tvdevice/tv_device.c

@@ -29,7 +29,7 @@
  *
  ******************************************************************************/
 
-#include "upnp_tv_device.h"
+#include "tv_device.h"
 
 #include <assert.h>