From 84d23f2ac49ec7ffb7315859c801d6393090b630 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Fri, 29 Oct 2010 02:08:32 +0200 Subject: [PATCH] install header files --- include/Makefile.am | 2 +- lib/actions/Makefile.am | 7 +++++-- lib/base/Makefile.am | 41 +++++++++++++++++++++------------------- lib/components/Makefile.am | 5 ++++- lib/driver/Makefile.am | 15 +++++++++------ lib/dvb/Makefile.am | 45 +++++++++++++++++++++++--------------------- lib/dvb/lowlevel/Makefile.am | 3 ++- lib/dvb_ci/Makefile.am | 17 ++++++++++------- lib/gdi/Makefile.am | 36 +++++++++++++++++++---------------- lib/gui/Makefile.am | 39 ++++++++++++++++++++------------------ lib/mmi/Makefile.am | 5 ++++- lib/nav/Makefile.am | 5 ++++- lib/python/Makefile.am | 9 +++++++-- lib/service/Makefile.am | 18 +++++++++++------- 14 files changed, 144 insertions(+), 103 deletions(-) diff --git a/include/Makefile.am b/include/Makefile.am index d0c682f..ada16ca 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,3 +1,3 @@ -EXTRA_DIST = \ +pkginclude_HEADERS = \ connection.h \ libsig_comp.h diff --git a/lib/actions/Makefile.am b/lib/actions/Makefile.am index 7535786..7aa466b 100644 --- a/lib/actions/Makefile.am +++ b/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 diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am index 652ef9c..becb032 100644 --- a/lib/base/Makefile.am +++ b/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 diff --git a/lib/components/Makefile.am b/lib/components/Makefile.am index e873e52..364c694 100644 --- a/lib/components/Makefile.am +++ b/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 diff --git a/lib/driver/Makefile.am b/lib/driver/Makefile.am index 63a205a..88d9bec 100644 --- a/lib/driver/Makefile.am +++ b/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 diff --git a/lib/dvb/Makefile.am b/lib/dvb/Makefile.am index 74b43d0..9b33755 100644 --- a/lib/dvb/Makefile.am +++ b/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 diff --git a/lib/dvb/lowlevel/Makefile.am b/lib/dvb/lowlevel/Makefile.am index 98e89f9..1108097 100644 --- a/lib/dvb/lowlevel/Makefile.am +++ b/lib/dvb/lowlevel/Makefile.am @@ -1,3 +1,4 @@ -EXTRA_DIST = \ +lowlevelincludedir = $(pkgincludedir)/lib/dvb/lowlevel +lowlevelinclude_HEADERS = \ eit.h \ mhw.h diff --git a/lib/dvb_ci/Makefile.am b/lib/dvb_ci/Makefile.am index c53c4da..9ef7249 100644 --- a/lib/dvb_ci/Makefile.am +++ b/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 diff --git a/lib/gdi/Makefile.am b/lib/gdi/Makefile.am index a47855f..febbab2 100644 --- a/lib/gdi/Makefile.am +++ b/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 diff --git a/lib/gui/Makefile.am b/lib/gui/Makefile.am index 30b00bf..9d31bf7 100644 --- a/lib/gui/Makefile.am +++ b/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 diff --git a/lib/mmi/Makefile.am b/lib/mmi/Makefile.am index 9c821c9..392c52c 100644 --- a/lib/mmi/Makefile.am +++ b/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 diff --git a/lib/nav/Makefile.am b/lib/nav/Makefile.am index fc3dadc..3d57d6a 100644 --- a/lib/nav/Makefile.am +++ b/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 diff --git a/lib/python/Makefile.am b/lib/python/Makefile.am index 5cbda78..c432b82 100644 --- a/lib/python/Makefile.am +++ b/lib/python/Makefile.am @@ -10,16 +10,21 @@ noinst_LIBRARIES = libenigma_python.a libenigma_python_a_SOURCES = \ connections.cpp \ + python.cpp + +pythonincludedir = $(pkgincludedir)/lib/python +pythoninclude_HEADERS = \ connections.h \ - python.cpp \ python.h \ swig.h nodist_libenigma_python_a_SOURCES = \ enigma_python_wrap.cxx +noinst_PYTHON = \ + enigma_py_patcher.py + EXTRA_DIST = \ - enigma_py_patcher.py \ enigma_python.i enigma_python_wrap.cxx: $(srcdir)/enigma_python.i diff --git a/lib/service/Makefile.am b/lib/service/Makefile.am index a19b8b1..edafd1a 100644 --- a/lib/service/Makefile.am +++ b/lib/service/Makefile.am @@ -11,23 +11,27 @@ noinst_LIBRARIES = libenigma_service.a libenigma_service_a_SOURCES = \ event.cpp \ + listboxservice.cpp \ + service.cpp \ + servicedvb.cpp \ + servicedvbrecord.cpp \ + servicefs.cpp \ + servicemp3.cpp + +serviceincludedir = $(pkgincludedir)/lib/service +serviceinclude_HEADERS = \ event.h \ iservice.h \ - listboxservice.cpp \ listboxservice.h \ - service.cpp \ service.h \ - servicedvb.cpp \ servicedvb.h \ - servicedvbrecord.cpp \ servicedvbrecord.h \ - servicefs.cpp \ servicefs.h \ - servicemp3.cpp \ servicemp3.h if HAVE_LIBXINE libenigma_service_a_SOURCES += \ - servicexine.cpp \ + servicexine.cpp +serviceinclude_HEADERS += \ servicexine.h endif -- 2.7.4