clean up build #2

* use swig macros from autoconf archive
* generate and use enigma2_config.h (include from command-line)
* check for dbox/fp.h and dbox/lcd-ks0713.h
* clean up checks for libdreamdvd and lib*gif
* fix some dependencies for generated files and header files

14 files changed, 258 insertions, 51 deletions

diff --git a/lib/actions/Makefile.am b/lib/actions/Makefile.am
index 45f0177b..9f62e2e7 100644
--- a/lib/actions/Makefile.am
+++ b/lib/actions/Makefile.am
@@ -1,7 +1,8 @@
 AM_CPPFLAGS = \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/include \
-	-include Python.h
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
 EXTRA_DIST = parseactions.py
 
@@ -11,11 +12,12 @@ libenigma_actions_la_SOURCES = \
 	action.cpp \
 	action.h
 
+nodist_libenigma_actions_la_SOURCES = \
+	actionids.h
+
 BUILT_SOURCES = actionids.h
 CLEANFILES = actionids.h
 
-action.cpp: actionids.h
-
-actionids.h: $(top_srcdir)/lib/gui/*.h
+actionids.h: $(srcdir)/parseactions.py $(top_srcdir)/lib/gui/*.h
 	$(PYTHON) $(srcdir)/parseactions.py include $(top_srcdir)/lib/gui/*.h > $@
 	$(PYTHON) $(srcdir)/parseactions.py parse $(top_srcdir)/lib/gui/*.h >> $@
diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am
index 5fd3eaf2..498244fb 100644
--- a/lib/base/Makefile.am
+++ b/lib/base/Makefile.am
@@ -1,14 +1,47 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-include Python.h
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
 noinst_LTLIBRARIES = libenigma_base.la
 
 libenigma_base_la_SOURCES = \
-	buffer.cpp ebase.cpp eerror.cpp elock.cpp \
-	init.cpp message.cpp thread.cpp \
-	smartptr.cpp estring.cpp connection.cpp \
-	filepush.cpp encoding.cpp console.cpp rawfile.cpp \
-	nconfig.cpp ioprio.cpp etpm.cpp
-
+	buffer.cpp \
+	buffer.h \
+	connection.cpp \
+	console.cpp \
+	console.h \
+	ebase.cpp \
+	ebase.h \
+	eerror.cpp \
+	eerror.h \
+	elock.cpp \
+	elock.h \
+	encoding.cpp \
+	encoding.h \
+	eptrlist.h \
+	estring.cpp \
+	estring.h \
+	etpm.cpp \
+	etpm.h \
+	filepush.cpp \
+	filepush.h \
+	i18n.h \
+	init.cpp \
+	init.h \
+	init_num.h \
+	ioprio.cpp \
+	ioprio.h \
+	message.cpp \
+	message.h \
+	nconfig.cpp \
+	nconfig.h \
+	object.h \
+	rawfile.cpp \
+	rawfile.h \
+	ringbuffer.h \
+	smartptr.cpp \
+	smartptr.h \
+	thread.cpp \
+	thread.h
diff --git a/lib/components/Makefile.am b/lib/components/Makefile.am
index 960e101c..cef5890e 100644
--- a/lib/components/Makefile.am
+++ b/lib/components/Makefile.am
@@ -1,8 +1,13 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-include Python.h
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
 noinst_LTLIBRARIES = libenigma_components.la
 
-libenigma_components_la_SOURCES = scan.cpp file_eraser.cpp
+libenigma_components_la_SOURCES = \
+	file_eraser.cpp \
+	file_eraser.h \
+	scan.cpp \
+	scan.h
diff --git a/lib/driver/Makefile.am b/lib/driver/Makefile.am
index 4b8fc086..74d24fab 100644
--- a/lib/driver/Makefile.am
+++ b/lib/driver/Makefile.am
@@ -1,9 +1,26 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-include Python.h
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
 noinst_LTLIBRARIES = libenigma_driver.la
 
 libenigma_driver_la_SOURCES = \
-	rc.cpp rcinput.cpp rcconsole.cpp avswitch.cpp rfmod.cpp etimezone.cpp misc_options.cpp
+	avswitch.cpp \
+	avswitch.h \
+	etimezone.cpp \
+	etimezone.h \
+	input_fake.h \
+	misc_options.cpp \
+	misc_options.h \
+	rc.cpp \
+	rc.h \
+	rcconsole.cpp \
+	rcconsole.h \
+	rcdbox.h \
+	rcdreambox2.h \
+	rcinput.cpp \
+	rcinput.h \
+	rfmod.cpp \
+	rfmod.h
diff --git a/lib/dvb/Makefile.am b/lib/dvb/Makefile.am
index cef71405..91464982 100644
--- a/lib/dvb/Makefile.am
+++ b/lib/dvb/Makefile.am
@@ -3,12 +3,59 @@ SUBDIRS = lowlevel
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-include Python.h
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
 noinst_LTLIBRARIES = libenigma_dvb.la
 
-libenigma_dvb_la_SOURCES = dvb.cpp demux.cpp frontend.cpp esection.cpp db.cpp \
-	sec.cpp scan.cpp crc32.cpp pmt.cpp decoder.cpp eit.cpp rotor_calc.cpp \
-	epgcache.cpp dvbtime.cpp metaparser.cpp volume.cpp tstools.cpp pvrparse.cpp \
-	pesparse.cpp teletext.cpp radiotext.cpp subtitle.cpp
-
+libenigma_dvb_la_SOURCES = \
+	crc32.cpp \
+	crc32.h \
+	db.cpp \
+	db.h \
+	decoder.cpp \
+	decoder.h \
+	demux.cpp \
+	demux.h \
+	dvb.cpp \
+	dvb.h \
+	dvbtime.cpp \
+	dvbtime.h \
+	eit.cpp \
+	eit.h \
+	epgcache.cpp \
+	epgcache.h \
+	esection.cpp \
+	esection.h \
+	frontend.cpp \
+	frontend.h \
+	frontendparms.h \
+	idemux.h \
+	idvb.h \
+	isection.h \
+	list.h \
+	metaparser.cpp \
+	metaparser.h \
+	pesparse.cpp \
+	pesparse.h \
+	pmt.cpp \
+	pmt.h \
+	pvrparse.cpp \
+	pvrparse.h \
+	radiotext.cpp \
+	radiotext.h \
+	rotor_calc.cpp \
+	rotor_calc.h \
+	scan.cpp \
+	scan.h \
+	sec.cpp \
+	sec.h \
+	specs.h \
+	subtitle.cpp \
+	subtitle.h \
+	teletext.cpp \
+	teletext.h \
+	tstools.cpp \
+	tstools.h \
+	volume.cpp \
+	volume.h
diff --git a/lib/dvb_ci/Makefile.am b/lib/dvb_ci/Makefile.am
index 153f8c0b..af839e73 100644
--- a/lib/dvb_ci/Makefile.am
+++ b/lib/dvb_ci/Makefile.am
@@ -1,12 +1,25 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-include Python.h
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
 noinst_LTLIBRARIES = libenigma_dvb_ci.la
 
-libenigma_dvb_ci_la_SOURCES = dvbci.cpp dvbci_session.cpp dvbci_resmgr.cpp \
-														 dvbci_appmgr.cpp dvbci_camgr.cpp \
-														 dvbci_datetimemgr.cpp dvbci_mmi.cpp \
-														 dvbci_ui.cpp
-
+libenigma_dvb_ci_la_SOURCES = \
+	dvbci.cpp \
+	dvbci.h \
+	dvbci_appmgr.cpp \
+	dvbci_appmgr.h \
+	dvbci_camgr.cpp \
+	dvbci_camgr.h \
+	dvbci_datetimemgr.cpp \
+	dvbci_datetimemgr.h \
+	dvbci_mmi.cpp \
+	dvbci_mmi.h \
+	dvbci_resmgr.cpp \
+	dvbci_resmgr.h \
+	dvbci_session.cpp \
+	dvbci_session.h \
+	dvbci_ui.cpp \
+	dvbci_ui.h
diff --git a/lib/gdi/Makefile.am b/lib/gdi/Makefile.am
index 192990b9..f1f69ef5 100644
--- a/lib/gdi/Makefile.am
+++ b/lib/gdi/Makefile.am
@@ -1,15 +1,49 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-include Python.h
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
 noinst_LTLIBRARIES = libenigma_gdi.la
 
 libenigma_gdi_la_SOURCES = \
-	region.cpp grc.cpp epng.cpp erect.cpp fb.cpp font.cpp font_arabic.cpp gfbdc.cpp  \
-	glcddc.cpp gpixmap.cpp lcd.cpp gfont.cpp accel.cpp picload.cpp picexif.cpp \
-	compositing.cpp bcm.cpp
+	accel.cpp \
+	accel.h \
+	bcm.cpp \
+	compositing.cpp \
+	compositing.h \
+	epng.cpp \
+	epng.h \
+	epoint.h \
+	erect.cpp \
+	erect.h \
+	esize.h \
+	fb.cpp \
+	fb.h \
+	font.cpp \
+	font.h \
+	font_arabic.cpp \
+	gfbdc.cpp \
+	gfbdc.h \
+	gfont.cpp \
+	gfont.h \
+	glcddc.cpp \
+	glcddc.h \
+	gpixmap.cpp \
+	gpixmap.h \
+	grc.cpp \
+	grc.h \
+	lcd.cpp \
+	lcd.h \
+	picexif.cpp \
+	picexif.h \
+	picload.cpp \
+	picload.h \
+	region.cpp \
+	region.h
 
 if WITH_SDL
-libenigma_gdi_la_SOURCES += sdl.cpp
+libenigma_gdi_la_SOURCES += \
+	sdl.cpp \
+	sdl.h
 endif
diff --git a/lib/gui/Makefile.am b/lib/gui/Makefile.am
index 290eaab9..39c05d9a 100644
--- a/lib/gui/Makefile.am
+++ b/lib/gui/Makefile.am
@@ -1,12 +1,47 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-include Python.h
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
 noinst_LTLIBRARIES = libenigma_gui.la
 
 libenigma_gui_la_SOURCES = \
-	ebutton.cpp elabel.cpp eslider.cpp ewidget.cpp ewidgetdesktop.cpp  \
-	ewindow.cpp ewindowstyle.cpp elistbox.cpp elistboxcontent.cpp \
-	epixmap.cpp ewindowstyleskinned.cpp einput.cpp einputstring.cpp einputnumber.cpp \
-	ewidgetanimation.cpp epositiongauge.cpp evideo.cpp esubtitle.cpp ecanvas.cpp
+	ebutton.cpp \
+	ebutton.h \
+	ecanvas.cpp \
+	ecanvas.h \
+	einput.cpp \
+	einput.h \
+	einputnumber.cpp \
+	einputnumber.h \
+	einputstring.cpp \
+	einputstring.h \
+	elabel.cpp \
+	elabel.h \
+	elistbox.cpp \
+	elistbox.h \
+	elistboxcontent.cpp \
+	elistboxcontent.h \
+	epixmap.cpp \
+	epixmap.h \
+	epositiongauge.cpp \
+	epositiongauge.h \
+	eslider.cpp \
+	eslider.h \
+	esubtitle.cpp \
+	esubtitle.h \
+	evideo.cpp \
+	evideo.h \
+	ewidget.cpp \
+	ewidget.h \
+	ewidgetanimation.cpp \
+	ewidgetanimation.h \
+	ewidgetdesktop.cpp \
+	ewidgetdesktop.h \
+	ewindow.cpp \
+	ewindow.h \
+	ewindowstyle.cpp \
+	ewindowstyle.h \
+	ewindowstyleskinned.cpp \
+	ewindowstyleskinned.h
diff --git a/lib/mmi/Makefile.am b/lib/mmi/Makefile.am
index f72d1586..a082949d 100644
--- a/lib/mmi/Makefile.am
+++ b/lib/mmi/Makefile.am
@@ -1,8 +1,11 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-include Python.h
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
 noinst_LTLIBRARIES = libenigma_mmi.la
 
-libenigma_mmi_la_SOURCES = mmi_ui.cpp
+libenigma_mmi_la_SOURCES = \
+	mmi_ui.cpp \
+	mmi_ui.h
diff --git a/lib/nav/Makefile.am b/lib/nav/Makefile.am
index 93468699..c6d1c927 100644
--- a/lib/nav/Makefile.am
+++ b/lib/nav/Makefile.am
@@ -1,11 +1,13 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-include Python.h
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
 noinst_LTLIBRARIES = libenigma_nav.la
 
 libenigma_nav_la_SOURCES = \
-	core.cpp pcore.cpp
-
-
+	core.cpp \
+	core.h \
+	pcore.cpp \
+	pcore.h
diff --git a/lib/python/Makefile.am b/lib/python/Makefile.am
index 03dcedb9..3c213a17 100644
--- a/lib/python/Makefile.am
+++ b/lib/python/Makefile.am
@@ -1,18 +1,30 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-include Python.h
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
 SUBDIRS = Components Tools Screens Plugins
 
 noinst_LTLIBRARIES = libenigma_python.la
 
 libenigma_python_la_SOURCES = \
-	python.cpp enigma_python_wrap.cxx connections.cpp
+	connections.cpp \
+	connections.h \
+	python.cpp \
+	python.h \
+	swig.h
 
-enigma_python_wrap.cxx: enigma_python.i
-	swig -I$(top_srcdir)/ -c++ -python -O -nortti -nothreads enigma_python.i
-	python enigma_py_patcher.py
+nodist_libenigma_python_la_SOURCES = \
+	enigma_python_wrap.cxx
+
+EXTRA_DIST = \
+	enigma_py_patcher.py \
+	enigma_python.i
+
+enigma_python_wrap.cxx: $(srcdir)/enigma_python.i
+	$(SWIG) $(AX_SWIG_PYTHON_OPT) -I$(top_srcdir) -O -nortti -nothreads -o $@ $<
+	$(PYTHON) $(srcdir)/enigma_py_patcher.py
 
 enigma.py: enigma_python_wrap.cxx
 
@@ -22,3 +34,4 @@ installdir = $(pkglibdir)/python
 
 install_PYTHON = \
 	enigma.py
+
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
index e79688b8..5bfc8afa 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
@@ -1,6 +1,7 @@
 CPPFLAGS += \
 	-I$(top_srcdir) \
-	-include Python.h
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
 OBJS = servicedvd.cpp
 
diff --git a/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am b/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am
index 914371e5..9fb72097 100644
--- a/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am
+++ b/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am
@@ -1,6 +1,7 @@
 CPPFLAGS += \
 	-I$(top_srcdir) \
-	-include Python.h
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
 OBJS = socket_mmi.cpp
 
diff --git a/lib/service/Makefile.am b/lib/service/Makefile.am
index c4dabebc..78d9b646 100644
--- a/lib/service/Makefile.am
+++ b/lib/service/Makefile.am
@@ -1,7 +1,8 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-include Python.h
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
 noinst_LTLIBRARIES = libenigma_service.la