3 files changed, 27 insertions, 26 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index b30549404..db9224a44 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -3,35 +3,40 @@
 ##
 
 #CFLAGS += @GLOBAL_CFLAGS@
-CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -DXINE_COMPILE
+CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64 -Wall -DXINE_COMPILE
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 libdir = $(XINE_PLUGINDIR)
 
-#lib_LTLIBRARIES = input_file.la input_net.la input_dvd.la input_vcd.la \
-#	input_stdin_fifo.la
-lib_LTLIBRARIES = input_file.la
+##
+# IMPORTANT:
+# ---------
+# All of xine input plugins should be named like the scheme "xineplug_inp_"
+#
+
+#lib_LTLIBRARIES = xineplug_inp_net.la xineplug_inp_dvd.la \
+#	xineplug_inp_vcd.la xineplug_inp_stdin_fifo.la \
+#	xineplug_inp_rtp.la
+lib_LTLIBRARIES = xineplug_inp_file.la
 
-#input_dvd_la_SOURCES = input_dvd.c dvd_udf.c
-#input_dvd_la_LDFLAGS = -avoid-version -module -Wl,-soname,input_dvd.so
-#input_dvd_la_LIBADD =
+xineplug_inp_file_la_SOURCES = input_file.c
+xineplug_inp_file_la_LDFLAGS = -avoid-version -module
 
-input_file_la_SOURCES = input_file.c
-input_file_la_LDFLAGS = -avoid-version -module -Wl,-soname,input_file.so
-input_file_la_LIBADD =
+#xineplug_inp_dvd_la_SOURCES = input_dvd.c dvd_udf.c
+#xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module
 
-#input_net_la_SOURCES = input_net.c
-#input_net_la_LDFLAGS = -avoid-version -module -Wl,-soname,input_net.so
-#input_net_la_LIBADD =
+#xineplug_inp_net_la_SOURCES = input_net.c
+#xineplug_inp_net_la_LDFLAGS = -avoid-version -module
 
-#input_vcd_la_SOURCES = input_vcd.c
-#input_vcd_la_LDFLAGS = -avoid-version -module -Wl,-soname,input_vcd.so
-#input_vcd_la_LIBADD =
+#xineplug_inp_vcd_la_SOURCES = input_vcd.c
+#xineplug_inp_vcd_la_LDFLAGS = -avoid-version -module
 
-#input_stdin_fifo_la_SOURCES = input_stdin_fifo.c
-#input_stdin_fifo_la_LDFLAGS = -avoid-version -module -Wl,-soname,input_stdin_fifo.so
+#xineplug_inp_stdin_fifo_la_SOURCES = input_stdin_fifo.c
+#xineplug_inp_stdin_fifo_la_LDFLAGS = -avoid-version -module
 
+#xineplug_inp_rtp_la_SOURCES = input_rtp.c
+#xineplug_inp_rtp_la_LDFLAGS = -avoid-version -module
 
 include_HEADERS = input_plugin.h
 noinst_HEADERS = dvd_udf.h
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 28741e437..782127961 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_file.c,v 1.2 2001/04/19 09:46:57 f1rmb Exp $
+ * $Id: input_file.c,v 1.3 2001/04/21 00:14:40 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -150,7 +150,7 @@ static char *file_plugin_get_identifier (void) {
 
 
 static input_plugin_t plugin_info = {
-  INPUT_INTERFACE_VERSION,
+  INPUT_PLUGIN_IFACE_VERSION,
   file_plugin_get_capabilities,
   file_plugin_open,
   file_plugin_read,
diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h
index 002c1b650..718fe6226 100644
--- a/src/input/input_plugin.h
+++ b/src/input/input_plugin.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_plugin.h,v 1.1 2001/04/18 22:34:05 f1rmb Exp $
+ * $Id: input_plugin.h,v 1.2 2001/04/21 00:14:41 f1rmb Exp $
  */
 
 #ifndef HAVE_INPUT_PLUGIN_H
@@ -28,7 +28,7 @@
 #include "buffer.h"
 #include "configfile.h"
 
-#define INPUT_INTERFACE_VERSION   1
+#define INPUT_PLUGIN_IFACE_VERSION   1
  
 #ifndef CLUT_T
 #define CLUT_T
@@ -170,9 +170,5 @@ typedef struct input_plugin_s
  * try to initialize the plugin with given interface version
  * and configuration options
  */
-input_plugin_t *get_input_plugin (int requested_interface,
-				 config_values_t *config);
-
-
 
 #endif