Non-recursive makefile part 2
authorMike Looijmans <milo-software@users.sourceforge.net>
Sat, 3 Mar 2012 17:53:58 +0000 (18:53 +0100)
committerMike Looijmans <milo-software@users.sourceforge.net>
Sat, 3 Mar 2012 18:04:25 +0000 (19:04 +0100)
19 files changed:
configure.ac
lib/Makefile.am
lib/base/.Makefile.inc.kate-swp [deleted file]
lib/driver/Makefile.am [deleted file]
lib/driver/Makefile.inc [new file with mode: 0644]
lib/dvb_ci/Makefile.am [deleted file]
lib/dvb_ci/Makefile.inc [new file with mode: 0644]
lib/gdi/Makefile.am [deleted file]
lib/gdi/Makefile.inc [new file with mode: 0644]
lib/gui/Makefile.am [deleted file]
lib/gui/Makefile.inc [new file with mode: 0644]
lib/mmi/Makefile.am [deleted file]
lib/mmi/Makefile.inc [new file with mode: 0644]
lib/nav/Makefile.am [deleted file]
lib/nav/Makefile.inc [new file with mode: 0644]
lib/network/Makefile.am [deleted file]
lib/network/Makefile.inc [new file with mode: 0644]
lib/service/Makefile.am [deleted file]
lib/service/Makefile.inc [new file with mode: 0644]

index ca34709..972effc 100644 (file)
@@ -168,13 +168,6 @@ data/skin_default/spinner/Makefile
 include/Makefile
 lib/Makefile
 lib/base/eenv.cpp
-lib/driver/Makefile
-lib/dvb_ci/Makefile
-lib/gdi/Makefile
-lib/gui/Makefile
-lib/mmi/Makefile
-lib/nav/Makefile
-lib/network/Makefile
 lib/python/Makefile
 lib/python/Components/Makefile
 lib/python/Components/Converter/Makefile
@@ -254,7 +247,6 @@ lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile
 lib/python/Plugins/SystemPlugins/WirelessLan/Makefile
 lib/python/Plugins/SystemPlugins/WirelessLan/meta/Makefile
 lib/python/Tools/Makefile
-lib/service/Makefile
 po/Makefile
 main/Makefile
 tools/Makefile
index aeb8427..8b0ee86 100644 (file)
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = subdir-objects
-SUBDIRS = dvb_ci gdi service driver nav gui python mmi network
+SUBDIRS = python
 
 AM_CPPFLAGS = \
        -I$(top_builddir) \
@@ -17,3 +17,11 @@ include actions/Makefile.inc
 include base/Makefile.inc
 include components/Makefile.inc
 include dvb/Makefile.inc
+include dvb_ci/Makefile.inc
+include gdi/Makefile.inc
+include service/Makefile.inc
+include driver/Makefile.inc
+include nav/Makefile.inc
+include gui/Makefile.inc
+include mmi/Makefile.inc
+include network/Makefile.inc
diff --git a/lib/base/.Makefile.inc.kate-swp b/lib/base/.Makefile.inc.kate-swp
deleted file mode 100644 (file)
index f73bf3d..0000000
Binary files a/lib/base/.Makefile.inc.kate-swp and /dev/null differ
diff --git a/lib/driver/Makefile.am b/lib/driver/Makefile.am
deleted file mode 100644 (file)
index 1e5cffb..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/include \
-       -include Python.h \
-       -include $(top_builddir)/enigma2_config.h
-
-AM_CXXFLAGS = \
-       $(LIBSDL_CFLAGS)
-
-noinst_LIBRARIES = libenigma_driver.a
-
-libenigma_driver_a_SOURCES = \
-       avswitch.cpp \
-       etimezone.cpp \
-       misc_options.cpp \
-       rc.cpp \
-       rcinput.cpp \
-       rfmod.cpp \
-       hdmi_cec.cpp
-
-driverincludedir = $(pkgincludedir)/lib/driver
-driverinclude_HEADERS = \
-       avswitch.h \
-       etimezone.h \
-       input_fake.h \
-       misc_options.h \
-       rc.h \
-       rcconsole.h \
-       rcdbox.h \
-       rcdreambox2.h \
-       rcinput.h \
-       rfmod.h \
-       hdmi_cec.h
-
-if HAVE_LIBSDL
-libenigma_driver_a_SOURCES += \
-       rcsdl.cpp \
-       rcsdl.h
-endif
diff --git a/lib/driver/Makefile.inc b/lib/driver/Makefile.inc
new file mode 100644 (file)
index 0000000..d79d3d2
--- /dev/null
@@ -0,0 +1,32 @@
+noinst_LIBRARIES += driver/libenigma_driver.a
+
+driver_libenigma_driver_a_CXXFLAGS = $(LIBSDL_CFLAGS)
+
+driver_libenigma_driver_a_SOURCES = \
+       driver/avswitch.cpp \
+       driver/etimezone.cpp \
+       driver/misc_options.cpp \
+       driver/rc.cpp \
+       driver/rcinput.cpp \
+       driver/rfmod.cpp \
+       driver/hdmi_cec.cpp
+
+driverincludedir = $(pkgincludedir)/lib/driver
+driverinclude_HEADERS = \
+       driver/avswitch.h \
+       driver/etimezone.h \
+       driver/input_fake.h \
+       driver/misc_options.h \
+       driver/rc.h \
+       driver/rcconsole.h \
+       driver/rcdbox.h \
+       driver/rcdreambox2.h \
+       driver/rcinput.h \
+       driver/rfmod.h \
+       driver/hdmi_cec.h
+
+if HAVE_LIBSDL
+driver_libenigma_driver_a_SOURCES += \
+       driver/rcsdl.cpp \
+       driver/rcsdl.h
+endif
diff --git a/lib/dvb_ci/Makefile.am b/lib/dvb_ci/Makefile.am
deleted file mode 100644 (file)
index 9ef7249..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/include \
-       -include Python.h \
-       -include $(top_builddir)/enigma2_config.h
-
-noinst_LIBRARIES = libenigma_dvb_ci.a
-
-libenigma_dvb_ci_a_SOURCES = \
-       dvbci.cpp \
-       dvbci_appmgr.cpp \
-       dvbci_camgr.cpp \
-       dvbci_datetimemgr.cpp \
-       dvbci_mmi.cpp \
-       dvbci_resmgr.cpp \
-       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.h
diff --git a/lib/dvb_ci/Makefile.inc b/lib/dvb_ci/Makefile.inc
new file mode 100644 (file)
index 0000000..0366b8c
--- /dev/null
@@ -0,0 +1,22 @@
+noinst_LIBRARIES += dvb_ci/libenigma_dvb_ci.a
+
+dvb_ci_libenigma_dvb_ci_a_SOURCES = \
+       dvb_ci/dvbci.cpp \
+       dvb_ci/dvbci_appmgr.cpp \
+       dvb_ci/dvbci_camgr.cpp \
+       dvb_ci/dvbci_datetimemgr.cpp \
+       dvb_ci/dvbci_mmi.cpp \
+       dvb_ci/dvbci_resmgr.cpp \
+       dvb_ci/dvbci_session.cpp \
+       dvb_ci/dvbci_ui.cpp
+
+dvbciincludedir = $(pkgincludedir)/lib/dvb_ci
+dvbciinclude_HEADERS = \
+       dvb_ci/dvbci.h \
+       dvb_ci/dvbci_appmgr.h \
+       dvb_ci/dvbci_camgr.h \
+       dvb_ci/dvbci_datetimemgr.h \
+       dvb_ci/dvbci_mmi.h \
+       dvb_ci/dvbci_resmgr.h \
+       dvb_ci/dvbci_session.h \
+       dvb_ci/dvbci_ui.h
diff --git a/lib/gdi/Makefile.am b/lib/gdi/Makefile.am
deleted file mode 100644 (file)
index 20321f5..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/include \
-       -include Python.h \
-       -include $(top_builddir)/enigma2_config.h
-
-AM_CXXFLAGS = \
-       $(LIBSDL_CFLAGS)
-
-noinst_LIBRARIES = libenigma_gdi.a
-
-libenigma_gdi_a_SOURCES = \
-       accel.cpp \
-       bcm.cpp \
-       compositing.cpp \
-       epng.cpp \
-       erect.cpp \
-       fb.cpp \
-       font.cpp \
-       font_arabic.cpp \
-       gfont.cpp \
-       glcddc.cpp \
-       gmaindc.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.h \
-       esize.h \
-       fb.h \
-       font.h \
-       gfont.h \
-       glcddc.h \
-       gpixmap.h \
-       grc.h \
-       lcd.h \
-       picexif.h \
-       picload.h \
-       region.h
-
-if HAVE_LIBSDL
-libenigma_gdi_a_SOURCES += \
-       sdl.cpp \
-       sdl.h
-else
-libenigma_gdi_a_SOURCES += \
-       gfbdc.cpp \
-       gfbdc.h
-endif
diff --git a/lib/gdi/Makefile.inc b/lib/gdi/Makefile.inc
new file mode 100644 (file)
index 0000000..c23f05d
--- /dev/null
@@ -0,0 +1,51 @@
+noinst_LIBRARIES += gdi/libenigma_gdi.a
+
+gdi_libenigma_gdi_CXXFLAGS = $(LIBSDL_CFLAGS)
+
+gdi_libenigma_gdi_a_SOURCES = \
+       gdi/accel.cpp \
+       gdi/bcm.cpp \
+       gdi/compositing.cpp \
+       gdi/epng.cpp \
+       gdi/erect.cpp \
+       gdi/fb.cpp \
+       gdi/font.cpp \
+       gdi/font_arabic.cpp \
+       gdi/gfont.cpp \
+       gdi/glcddc.cpp \
+       gdi/gmaindc.cpp \
+       gdi/gpixmap.cpp \
+       gdi/grc.cpp \
+       gdi/lcd.cpp \
+       gdi/picexif.cpp \
+       gdi/picload.cpp \
+       gdi/region.cpp
+
+gdiincludedir = $(pkgincludedir)/lib/gdi
+gdiinclude_HEADERS = \
+       gdi/accel.h \
+       gdi/compositing.h \
+       gdi/epng.h \
+       gdi/epoint.h \
+       gdi/erect.h \
+       gdi/esize.h \
+       gdi/fb.h \
+       gdi/font.h \
+       gdi/gfont.h \
+       gdi/glcddc.h \
+       gdi/gpixmap.h \
+       gdi/grc.h \
+       gdi/lcd.h \
+       gdi/picexif.h \
+       gdi/picload.h \
+       gdi/region.h
+
+if HAVE_LIBSDL
+gdi_libenigma_gdi_a_SOURCES += \
+       gdi/sdl.cpp \
+       gdi/sdl.h
+else
+gdi_libenigma_gdi_a_SOURCES += \
+       gdi/gfbdc.cpp \
+       gdi/gfbdc.h
+endif
diff --git a/lib/gui/Makefile.am b/lib/gui/Makefile.am
deleted file mode 100644 (file)
index 9d31bf7..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/include \
-       -include Python.h \
-       -include $(top_builddir)/enigma2_config.h
-
-noinst_LIBRARIES = libenigma_gui.a
-
-libenigma_gui_a_SOURCES = \
-       ebutton.cpp \
-       ecanvas.cpp \
-       einput.cpp \
-       einputnumber.cpp \
-       einputstring.cpp \
-       elabel.cpp \
-       elistbox.cpp \
-       elistboxcontent.cpp \
-       epixmap.cpp \
-       epositiongauge.cpp \
-       eslider.cpp \
-       esubtitle.cpp \
-       evideo.cpp \
-       ewidget.cpp \
-       ewidgetanimation.cpp \
-       ewidgetdesktop.cpp \
-       ewindow.cpp \
-       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.h
diff --git a/lib/gui/Makefile.inc b/lib/gui/Makefile.inc
new file mode 100644 (file)
index 0000000..72d3fff
--- /dev/null
@@ -0,0 +1,44 @@
+noinst_LIBRARIES += gui/libenigma_gui.a
+
+gui_libenigma_gui_a_SOURCES = \
+       gui/ebutton.cpp \
+       gui/ecanvas.cpp \
+       gui/einput.cpp \
+       gui/einputnumber.cpp \
+       gui/einputstring.cpp \
+       gui/elabel.cpp \
+       gui/elistbox.cpp \
+       gui/elistboxcontent.cpp \
+       gui/epixmap.cpp \
+       gui/epositiongauge.cpp \
+       gui/eslider.cpp \
+       gui/esubtitle.cpp \
+       gui/evideo.cpp \
+       gui/ewidget.cpp \
+       gui/ewidgetanimation.cpp \
+       gui/ewidgetdesktop.cpp \
+       gui/ewindow.cpp \
+       gui/ewindowstyle.cpp \
+       gui/ewindowstyleskinned.cpp
+
+guiincludedir = $(pkgincludedir)/lib/gui
+guiinclude_HEADERS = \
+       gui/ebutton.h \
+       gui/ecanvas.h \
+       gui/einput.h \
+       gui/einputnumber.h \
+       gui/einputstring.h \
+       gui/elabel.h \
+       gui/elistbox.h \
+       gui/elistboxcontent.h \
+       gui/epixmap.h \
+       gui/epositiongauge.h \
+       gui/eslider.h \
+       gui/esubtitle.h \
+       gui/evideo.h \
+       gui/ewidget.h \
+       gui/ewidgetanimation.h \
+       gui/ewidgetdesktop.h \
+       gui/ewindow.h \
+       gui/ewindowstyle.h \
+       gui/ewindowstyleskinned.h
diff --git a/lib/mmi/Makefile.am b/lib/mmi/Makefile.am
deleted file mode 100644 (file)
index 392c52c..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/include \
-       -include Python.h \
-       -include $(top_builddir)/enigma2_config.h
-
-noinst_LIBRARIES = libenigma_mmi.a
-
-libenigma_mmi_a_SOURCES = \
-       mmi_ui.cpp
-
-mmiincludedir = $(pkgincludedir)/lib/mmi
-mmiinclude_HEADERS = \
-       mmi_ui.h
diff --git a/lib/mmi/Makefile.inc b/lib/mmi/Makefile.inc
new file mode 100644 (file)
index 0000000..4fc2636
--- /dev/null
@@ -0,0 +1,8 @@
+noinst_LIBRARIES += mmi/libenigma_mmi.a
+
+mmi_libenigma_mmi_a_SOURCES = \
+       mmi/mmi_ui.cpp
+
+mmiincludedir = $(pkgincludedir)/lib/mmi
+mmiinclude_HEADERS = \
+       mmi/mmi_ui.h
diff --git a/lib/nav/Makefile.am b/lib/nav/Makefile.am
deleted file mode 100644 (file)
index 3d57d6a..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/include \
-       -include Python.h \
-       -include $(top_builddir)/enigma2_config.h
-
-noinst_LIBRARIES = libenigma_nav.a
-
-libenigma_nav_a_SOURCES = \
-       core.cpp \
-       pcore.cpp
-
-navincludedir = $(pkgincludedir)/lib/nav
-navinclude_HEADERS = \
-       core.h \
-       pcore.h
diff --git a/lib/nav/Makefile.inc b/lib/nav/Makefile.inc
new file mode 100644 (file)
index 0000000..abb653e
--- /dev/null
@@ -0,0 +1,10 @@
+noinst_LIBRARIES += nav/libenigma_nav.a
+
+nav_libenigma_nav_a_SOURCES = \
+       nav/core.cpp \
+       nav/pcore.cpp
+
+navincludedir = $(pkgincludedir)/lib/nav
+navinclude_HEADERS = \
+       nav/core.h \
+       nav/pcore.h
diff --git a/lib/network/Makefile.am b/lib/network/Makefile.am
deleted file mode 100644 (file)
index 5921770..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/include \
-       -include Python.h \
-       -include $(top_builddir)/enigma2_config.h
-
-noinst_LIBRARIES = libenigma_network.a
-
-libenigma_network_a_SOURCES = \
-       serversocket.cpp \
-       socket.cpp
-
-networkincludedir = $(pkgincludedir)/lib/network
-networkinclude_HEADERS = \
-       serversocket.h \
-       socket.h
diff --git a/lib/network/Makefile.inc b/lib/network/Makefile.inc
new file mode 100644 (file)
index 0000000..7851854
--- /dev/null
@@ -0,0 +1,10 @@
+noinst_LIBRARIES += network/libenigma_network.a
+
+network_libenigma_network_a_SOURCES = \
+       network/serversocket.cpp \
+       network/socket.cpp
+
+networkincludedir = $(pkgincludedir)/lib/network
+networkinclude_HEADERS = \
+       network/serversocket.h \
+       network/socket.h
diff --git a/lib/service/Makefile.am b/lib/service/Makefile.am
deleted file mode 100644 (file)
index b0dd123..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/include \
-       -include Python.h \
-       -include $(top_builddir)/enigma2_config.h
-
-AM_CXXFLAGS = \
-       $(LIBXINE_CFLAGS)
-
-noinst_LIBRARIES = libenigma_service.a
-
-libenigma_service_a_SOURCES = \
-       event.cpp \
-       listboxservice.cpp \
-       service.cpp \
-       servicedvb.cpp \
-       servicedvbrecord.cpp \
-       servicefs.cpp \
-       servicemp3.cpp \
-       servicem2ts.cpp \
-       servicedvbstream.cpp
-
-serviceincludedir = $(pkgincludedir)/lib/service
-serviceinclude_HEADERS = \
-       event.h \
-       iservice.h \
-       listboxservice.h \
-       service.h \
-       servicedvb.h \
-       servicedvbrecord.h \
-       servicefs.h \
-       servicemp3.h \
-       servicem2ts.h \
-       servicedvbstream.h
-
-if HAVE_LIBXINE
-libenigma_service_a_SOURCES += \
-       servicexine.cpp
-serviceinclude_HEADERS += \
-       servicexine.h
-endif
-
-if HAVE_LIBDDVD
-libenigma_service_a_SOURCES += \
-       servicedvd.cpp
-serviceinclude_HEADERS += \
-       servicedvd.h
-endif
\ No newline at end of file
diff --git a/lib/service/Makefile.inc b/lib/service/Makefile.inc
new file mode 100644 (file)
index 0000000..34f7935
--- /dev/null
@@ -0,0 +1,42 @@
+noinst_LIBRARIES += service/libenigma_service.a
+
+service_libenigma_service_a_CXXFLAGS = \
+       $(LIBXINE_CFLAGS)
+
+service_libenigma_service_a_SOURCES = \
+       service/event.cpp \
+       service/listboxservice.cpp \
+       service/service.cpp \
+       service/servicedvb.cpp \
+       service/servicedvbrecord.cpp \
+       service/servicefs.cpp \
+       service/servicemp3.cpp \
+       service/servicem2ts.cpp \
+       service/servicedvbstream.cpp
+
+serviceincludedir = $(pkgincludedir)/lib/service
+serviceinclude_HEADERS = \
+       service/event.h \
+       service/iservice.h \
+       service/listboxservice.h \
+       service/service.h \
+       service/servicedvb.h \
+       service/servicedvbrecord.h \
+       service/servicefs.h \
+       service/servicemp3.h \
+       service/servicem2ts.h \
+       service/servicedvbstream.h
+
+if HAVE_LIBXINE
+service_libenigma_service_a_SOURCES += \
+       service/servicexine.cpp
+serviceinclude_HEADERS += \
+       service/servicexine.h
+endif
+
+if HAVE_LIBDDVD
+service_libenigma_service_a_SOURCES += \
+       service/servicedvd.cpp
+serviceinclude_HEADERS += \
+       service/servicedvd.h
+endif
\ No newline at end of file