Index: videoIO/src/plugins/gstreamer/DeviceReadGst.h
===================================================================
--- videoIO/src/plugins/gstreamer/DeviceReadGst.h	(Revision 2704)
+++ videoIO/src/plugins/gstreamer/DeviceReadGst.h	(Arbeitskopie)
@@ -20,8 +20,8 @@
 #ifndef DEVICE_READ_GST_
 #define DEVICE_READ_GST_
 
-#include "../../DeviceRead.h"
-#include "../../VIOKernel.h"
+#include "../../core/DeviceRead.h"
+#include "../../core/VIOKernel.h"
 #include "gst/gst.h"
 #include "gst/app/gstappsink.h"
 #include "gst/app/gstappbuffer.h"
Index: videoIO/src/plugins/gstreamer/FileReadGst.h
===================================================================
--- videoIO/src/plugins/gstreamer/FileReadGst.h	(Revision 2704)
+++ videoIO/src/plugins/gstreamer/FileReadGst.h	(Arbeitskopie)
@@ -20,8 +20,8 @@
 #ifndef FILE_READ_GST_
 #define FILE_READ_GST_
 
-#include "../../FileRead.h"
-#include "../../VIOKernel.h"
+#include "../../core/FileRead.h"
+#include "../../core/VIOKernel.h"
 #include "gst/gst.h"
 #include "gst/app/gstappsink.h"
 #include "gst/app/gstappbuffer.h"
Index: videoIO/src/plugins/gstreamer/DeviceReadGst.cpp
===================================================================
--- videoIO/src/plugins/gstreamer/DeviceReadGst.cpp	(Revision 2704)
+++ videoIO/src/plugins/gstreamer/DeviceReadGst.cpp	(Arbeitskopie)
@@ -1,3 +1,4 @@
+
 //////////////////////////////////////////////////////////////////////////
 //
 //   VideoIO-Framework for GEM/PD
@@ -95,7 +96,7 @@
 {
   if(!have_pipeline_) return VIDEO_STOPPED;
 
-  if( gst_app_sink_end_of_stream(GST_APP_SINK (sink_)) ) 
+  if( gst_app_sink_is_eos(GST_APP_SINK (sink_)) ) 
     return VIDEO_STOPPED;
 
 //   post("GST_STATE: %d, GST_STATE_PENDING: %d",
@@ -318,7 +319,7 @@
 
   device_decode_ = gst_pipeline_new( "device_decode_");
 
-  source_ = gst_element_factory_make ("v4lsrc", "source_");
+  source_ = gst_element_factory_make ("v4l2src", "source_");
   g_assert(source_);
   if( device.size() != 0 )
     g_object_set (G_OBJECT(source_), "device", device.c_str(), NULL);
Index: videoIO/src/plugins/gstreamer/FileReadGst.cpp
===================================================================
--- videoIO/src/plugins/gstreamer/FileReadGst.cpp	(Revision 2704)
+++ videoIO/src/plugins/gstreamer/FileReadGst.cpp	(Arbeitskopie)
@@ -172,7 +172,7 @@
 {
   if(!have_pipeline_ || !video_bin_) return VIDEO_STOPPED;
 
-  if( gst_app_sink_end_of_stream( GST_APP_SINK (vsink_) ) ) 
+  if( gst_app_sink_is_eos( GST_APP_SINK (vsink_) ) ) 
   {
     stopVideo();
     return VIDEO_STOPPED;
@@ -288,7 +288,7 @@
   }
 
   // if we have end of stream send zero samples
-  if(gst_app_sink_end_of_stream( GST_APP_SINK (asink_)))
+  if(gst_app_sink_is_eos( GST_APP_SINK (asink_)))
   {
     while(n--)
     {
Index: videoIO/src/plugins/gstreamer/Makefile
===================================================================
--- videoIO/src/plugins/gstreamer/Makefile	(Revision 2704)
+++ videoIO/src/plugins/gstreamer/Makefile	(Arbeitskopie)
@@ -8,15 +8,15 @@
 #############################################################
 
 include Make.config
+include ../../Make.config
 
 #############################################################
 # build gem-external targets and objects
 
-INCLUDE=-I.
+INCLUDE=-I. -I../../core
 LIBS=-lc -lm
 CC_FLAGS=-c -Wall -O2 -fPIC -ffast-math -mmmx
 LD_FLAGS=--export-dynamic -shared
-EXTENSION=pd_linux
 
 #############################################################
 # build plugins/gstreamer/gstreamer interface
@@ -24,8 +24,9 @@
 GST_INCL=-I$(GST_INCLUDE) -I$(GLIB_INCLUDE1) -I$(GLIB_INCLUDE2) \
          -I$(XML_INCLUDE)
 GST_LIBS=-lgstreamer-0.10 -lgstapp-0.10
+PLUGINS=FileReadGst.so FileWriteGst.so DeviceReadGst.so
 
-all: FileReadGst.so FileWriteGst.so DeviceReadGst.so
+all: $(PLUGINS)
 
 %.so: %.cpp %.h
 	$(CXX) $(CC_FLAGS) $(GST_INCL) $<
@@ -36,11 +37,11 @@
 # clean and install
 
 clean:
-	rm -f *.o $.so
+	rm -f *.o *.so
 
 install:
-#	install -d $(PLUGIN_INSTALL)
-#	install -p $(plugins) $(PLUGIN_INSTALL)
+	install -d $(PLUGIN_INSTALL)
+	install -p $(PLUGINS) $(PLUGIN_INSTALL)
 
 # EOF
 #############################################################
Index: videoIO/src/plugins/gstreamer/FileWriteGst.h
===================================================================
--- videoIO/src/plugins/gstreamer/FileWriteGst.h	(Revision 2704)
+++ videoIO/src/plugins/gstreamer/FileWriteGst.h	(Arbeitskopie)
@@ -20,8 +20,8 @@
 #ifndef FILE_WRITE_GST_
 #define FILE_WRITE_GST_
 
-#include "../../FileWrite.h"
-#include "../../VIOKernel.h"
+#include "../../core/FileWrite.h"
+#include "../../core/VIOKernel.h"
 #include "gst/gst.h"
 #include "gst/app/gstappsrc.h"
 #include "gst/app/gstappbuffer.h"
Index: videoIO/src/Make.config
===================================================================
--- videoIO/src/Make.config	(Revision 2704)
+++ videoIO/src/Make.config	(Arbeitskopie)
@@ -13,13 +13,13 @@
 GEM_SRC?=../../../Gem/src
 
 # path of GEM library (needed for linking)
-GEM_LIB?=/usr/local/lib/pd/extra/Gem.pd_linux
+GEM_LIB?=/usr/lib/pd/extra/Gem.pd_linux
 
 # PD headers (only m_pd.h is needed)
-PD_SRC?=/usr/local/include
+PD_SRC?=/usr/include
 
 # path where to install the pd external
-PD_INSTALL?=/usr/local/lib/pd/extra
+PD_INSTALL?=/usr/lib/pd/extra
 
 
 VIDEOIO_SRC=../core
@@ -47,7 +47,7 @@
 # installation path for plugins
 # ATTENTION: must be /usr/lib/videoIO or
 #                    /usr/local/lib/videoIO
-PLUGIN_INSTALL?=/usr/local/lib/videoIO
+PLUGIN_INSTALL?=/usr/lib/videoIO
 
 
 
Index: videoIO/src/core/Makefile
===================================================================
--- videoIO/src/core/Makefile	(Revision 0)
+++ videoIO/src/core/Makefile	(Revision 0)
@@ -0,0 +1,45 @@
+# all builds gem-externals and plugins (gstreamer)
+default: all
+
+#############################################################
+# videoIO makefile
+#
+# 2008 (c) Georg Holzmann, IOhannes m zm��lnig
+#############################################################
+
+include ../Make.config
+
+#############################################################
+# build gem-external targets and objects
+INCLUDE=-I.
+LIBS=-lc -lm
+CC_FLAGS=-c -Wall -O2 -fPIC -ffast-math -mmmx
+LD_FLAGS=--export-dynamic -shared
+
+SOURCE := $(wildcard *.cpp)
+OBJECTS := $(SOURCE:.cpp=.o)
+TMP := $(wildcard *.cpp)
+CORE := $(TMP:.cpp=.so)
+
+
+#############################################################
+# build core interface
+
+all: $(CORE) 
+
+%.so: %.cpp %.h
+	$(CXX) $(CC_FLAGS)  $<
+	$(CXX) $(LD_FLAGS) -o $@ $*.o
+
+#############################################################
+# clean and install
+
+clean:
+	rm -f *.o *.so
+
+install:
+	install -d $(PLUGIN_INSTALL)
+	install -p $(plugins) $(PLUGIN_INSTALL)
+
+# EOF
+#############################################################
Index: videoIO/src/gem/pix_file_write.h
===================================================================
--- videoIO/src/gem/pix_file_write.h	(Revision 2704)
+++ videoIO/src/gem/pix_file_write.h	(Arbeitskopie)
@@ -22,7 +22,7 @@
 
 #include "Base/GemBase.h"
 #include "Base/GemPixUtil.h"
-#include "VIOKernel.h"
+#include "../core/VIOKernel.h"
 
 /*-----------------------------------------------------------------
 -------------------------------------------------------------------
Index: videoIO/src/gem/pix_device_read.h
===================================================================
--- videoIO/src/gem/pix_device_read.h	(Revision 2704)
+++ videoIO/src/gem/pix_device_read.h	(Arbeitskopie)
@@ -15,7 +15,7 @@
 
 #include "Base/GemBase.h"
 #include "Base/GemPixUtil.h"
-#include "VIOKernel.h"
+#include "../core/VIOKernel.h"
 
 /*-----------------------------------------------------------------
   CLASS
Index: videoIO/src/gem/pix_file_read.h
===================================================================
--- videoIO/src/gem/pix_file_read.h	(Revision 2704)
+++ videoIO/src/gem/pix_file_read.h	(Arbeitskopie)
@@ -21,7 +21,7 @@
 
 #include "Base/GemBase.h"
 #include "Base/GemPixUtil.h"
-#include "VIOKernel.h"
+#include "../core/VIOKernel.h"
 
 /*-----------------------------------------------------------------
     
Index: videoIO/src/Makefile
===================================================================
--- videoIO/src/Makefile	(Revision 2704)
+++ videoIO/src/Makefile	(Arbeitskopie)
@@ -33,12 +33,12 @@
 	make -C gem clean
 	make -C core clean
 
-#install:
-#	install -d $(PD_INSTALL)
-#	install -p $(TARGETS) $(PD_INSTALL)
-#	install -d $(PD_HELP)
-#	install -p ../help/*.pd $(PD_HELP)
-#	make -C plugins install
+install:
+	install -d $(PD_INSTALL)
+	install -d $(PD_HELP)
+	install -p ../help/*.pd $(PD_HELP)
+	make -C gem install
+	make -C plugins install
 
 # EOF
 #############################################################
