install header files

include/Makefile.am

@@ -1,3 +1,3 @@
-EXTRA_DIST = \
+pkginclude_HEADERS = \
 	connection.h \
 	libsig_comp.h

lib/actions/Makefile.am

@@ -10,10 +10,13 @@ EXTRA_DIST = parseactions.py
 noinst_LIBRARIES = libenigma_actions.a
 
 libenigma_actions_a_SOURCES = \
-	action.cpp \
+	action.cpp
+
+actionsincludedir = $(pkgincludedir)/lib/actions
+actionsinclude_HEADERS = \
 	action.h
 
-nodist_libenigma_actions_a_SOURCES = \
+nodist_actionsinclude_HEADERS = \
 	actionids.h
 
 BUILT_SOURCES = actionids.h

lib/base/Makefile.am

@@ -8,45 +8,48 @@ noinst_LIBRARIES = libenigma_base.a
 
 libenigma_base_a_SOURCES = \
 	buffer.cpp \
-	buffer.h \
 	connection.cpp \
 	console.cpp \
-	console.h \
 	ebase.cpp \
-	ebase.h \
 	eenv.cpp \
-	eenv.h \
 	eerror.cpp \
-	eerror.h \
 	elock.cpp \
-	elock.h \
 	encoding.cpp \
+	estring.cpp \
+	etpm.cpp \
+	filepush.cpp \
+	init.cpp \
+	ioprio.cpp \
+	message.cpp \
+	nconfig.cpp \
+	rawfile.cpp \
+	smartptr.cpp \
+	thread.cpp
+
+EXTRA_DIST = \
+	eenv.cpp.in
+
+baseincludedir = $(pkgincludedir)/lib/base
+baseinclude_HEADERS = \
+	buffer.h \
+	console.h \
+	ebase.h \
+	eenv.h \
+	eerror.h \
+	elock.h \
 	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
-
-EXTRA_DIST = \
-	eenv.cpp.in

lib/components/Makefile.am

@@ -8,6 +8,9 @@ noinst_LIBRARIES = libenigma_components.a
 
 libenigma_components_a_SOURCES = \
 	file_eraser.cpp \
+	scan.cpp
+
+componentsincludedir = $(pkgincludedir)/lib/components
+componentsinclude_HEADERS = \
 	file_eraser.h \
-	scan.cpp \
 	scan.h

lib/driver/Makefile.am

@@ -8,19 +8,22 @@ noinst_LIBRARIES = libenigma_driver.a
 
 libenigma_driver_a_SOURCES = \
 	avswitch.cpp \
-	avswitch.h \
 	etimezone.cpp \
+	misc_options.cpp \
+	rc.cpp \
+	rcconsole.cpp \
+	rcinput.cpp \
+	rfmod.cpp
+
+driverincludedir = $(pkgincludedir)/lib/driver
+driverinclude_HEADERS = \
+	avswitch.h \
 	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

lib/dvb/Makefile.am

@@ -10,52 +10,55 @@ noinst_LIBRARIES = libenigma_dvb.a
 
 libenigma_dvb_a_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 \
+	metaparser.cpp \
+	pesparse.cpp \
+	pmt.cpp \
+	pvrparse.cpp \
+	radiotext.cpp \
+	rotor_calc.cpp \
+	scan.cpp \
+	sec.cpp \
+	subtitle.cpp \
+	teletext.cpp \
+	tstools.cpp \
+	volume.cpp
+
+dvbincludedir = $(pkgincludedir)/lib/dvb
+dvbinclude_HEADERS = \
+	crc32.h \
+	db.h \
+	decoder.h \
+	demux.h \
+	dvb.h \
+	dvbtime.h \
+	eit.h \
+	epgcache.h \
+	esection.h \
 	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

lib/dvb/lowlevel/Makefile.am

@@ -1,3 +1,4 @@
-EXTRA_DIST = \
+lowlevelincludedir = $(pkgincludedir)/lib/dvb/lowlevel
+lowlevelinclude_HEADERS = \
 	eit.h \
 	mhw.h

lib/dvb_ci/Makefile.am

@@ -8,18 +8,21 @@ noinst_LIBRARIES = libenigma_dvb_ci.a
 
 libenigma_dvb_ci_a_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_ui.cpp
+
+dvbciincludedir = $(pkgincludedir)/lib/dvb_ci
+dvbciinclude_HEADERS = \
+	dvbci.h \
+	dvbci_appmgr.h \
+	dvbci_camgr.h \
+	dvbci_datetimemgr.h \
+	dvbci_mmi.h \
+	dvbci_resmgr.h \
 	dvbci_session.h \
-	dvbci_ui.cpp \
 	dvbci_ui.h

lib/gdi/Makefile.am

@@ -11,42 +11,46 @@ noinst_LIBRARIES = libenigma_gdi.a
 
 libenigma_gdi_a_SOURCES = \
 	accel.cpp \
-	accel.h \
 	bcm.cpp \
 	compositing.cpp \
-	compositing.h \
 	epng.cpp \
+	erect.cpp \
+	fb.cpp \
+	font.cpp \
+	font_arabic.cpp \
+	gfbdc.cpp \
+	gfont.cpp \
+	glcddc.cpp \
+	gpixmap.cpp \
+	grc.cpp \
+	lcd.cpp \
+	picexif.cpp \
+	picload.cpp \
+	region.cpp
+
+gdiincludedir = $(pkgincludedir)/lib/gdi
+gdiinclude_HEADERS = \
+	accel.h \
+	compositing.h \
 	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 HAVE_LIBSDL
 libenigma_gdi_a_SOURCES += \
-	sdl.cpp \
+	sdl.cpp
+gdiinclude_HEADERS += \
 	sdl.h
 endif

lib/gui/Makefile.am

@@ -8,40 +8,43 @@ noinst_LIBRARIES = libenigma_gui.a
 
 libenigma_gui_a_SOURCES = \
 	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 \
+	ewindowstyleskinned.cpp
+
+guiincludedir = $(pkgincludedir)/lib/gui
+guiinclude_HEADERS = \
+	ebutton.h \
+	ecanvas.h \
+	einput.h \
+	einputnumber.h \
+	einputstring.h \
+	elabel.h \
+	elistbox.h \
+	elistboxcontent.h \
+	epixmap.h \
+	epositiongauge.h \
+	eslider.h \
+	esubtitle.h \
+	evideo.h \
+	ewidget.h \
+	ewidgetanimation.h \
+	ewidgetdesktop.h \
+	ewindow.h \
 	ewindowstyle.h \
-	ewindowstyleskinned.cpp \
 	ewindowstyleskinned.h

lib/mmi/Makefile.am

@@ -7,5 +7,8 @@ AM_CPPFLAGS = \
 noinst_LIBRARIES = libenigma_mmi.a
 
 libenigma_mmi_a_SOURCES = \
-	mmi_ui.cpp \
+	mmi_ui.cpp
+
+mmiincludedir = $(pkgincludedir)/lib/mmi
+mmiinclude_HEADERS = \
 	mmi_ui.h

lib/nav/Makefile.am

@@ -8,6 +8,9 @@ noinst_LIBRARIES = libenigma_nav.a
 
 libenigma_nav_a_SOURCES = \
 	core.cpp \
+	pcore.cpp
+
+navincludedir = $(pkgincludedir)/lib/nav
+navinclude_HEADERS = \
 	core.h \
-	pcore.cpp \
 	pcore.h