From 76b4395fb1bc5a38ca67e7ce1991adba89c8cfbb Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Thu, 17 May 2012 13:18:58 +0200 Subject: [PATCH] clean up: sort sourcefiles in makefiles Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/cc8a1c6a7c1112197b022fd51b94ced9058e4946 Author: Thilo Graf Date: 2012-05-17 (Thu, 17 May 2012) --- src/driver/Makefile.am | 26 +++++++++++++------------- src/driver/audiodec/Makefile.am | 8 ++++---- src/driver/pictureviewer/Makefile.am | 7 +++++-- src/eitd/Makefile.am | 12 ++++++++++-- src/zapit/src/Makefile.am | 19 ++++++++++++++++--- 5 files changed, 48 insertions(+), 24 deletions(-) diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am index 430651655..617c4be36 100644 --- a/src/driver/Makefile.am +++ b/src/driver/Makefile.am @@ -18,24 +18,24 @@ noinst_LIBRARIES = libneutrino_driver.a libneutrino_driver_netfile.a libneutrino_driver_a_SOURCES = \ abstime.c \ + audiofile.cpp \ + audiometadata.cpp \ + audioplay.cpp \ + fade.cpp \ + fb_window.cpp \ + file.cpp \ fontrenderer.cpp \ framebuffer.cpp \ - fb_window.cpp \ + genpsi.c \ + radiotext.cpp \ + radiotools.cpp \ rcinput.cpp \ record.cpp \ - audioplay.cpp \ - screen_max.cpp \ - file.cpp \ - audiometadata.cpp \ - audiofile.cpp \ - shutdown_count.cpp \ - genpsi.c \ - streamts.cpp \ - radiotools.cpp \ - radiotext.cpp \ - fade.cpp \ - screenshot.cpp \ ringbuffer.c \ + screen_max.cpp \ + screenshot.cpp \ + shutdown_count.cpp \ + streamts.cpp \ volume.cpp if BOXTYPE_COOL diff --git a/src/driver/audiodec/Makefile.am b/src/driver/audiodec/Makefile.am index 7e73469a1..c21b2c4d0 100644 --- a/src/driver/audiodec/Makefile.am +++ b/src/driver/audiodec/Makefile.am @@ -27,10 +27,10 @@ endif libneutrino_driver_audiodec_a_SOURCES = \ basedec.cpp \ cdrdec.cpp \ + crc.c \ + $(FLACdec) \ mp3dec.cpp \ oggdec.cpp \ - wavdec.cpp \ - $(FLACdec) \ tag.c \ - crc.c \ - vis.cpp + vis.cpp \ + wavdec.cpp diff --git a/src/driver/pictureviewer/Makefile.am b/src/driver/pictureviewer/Makefile.am index 8c452bc78..c70fcf859 100644 --- a/src/driver/pictureviewer/Makefile.am +++ b/src/driver/pictureviewer/Makefile.am @@ -19,5 +19,8 @@ endif noinst_LIBRARIES = libneutrino_pictureviewer.a libneutrino_pictureviewer_a_SOURCES = \ - pictureviewer.cpp png.cpp bmp.cpp \ - jpeg.cpp gif.cpp crw.cpp + crw.cpp \ + gif.cpp \ + jpeg.cpp \ + pictureviewer.cpp \ + png.cpp bmp.cpp diff --git a/src/eitd/Makefile.am b/src/eitd/Makefile.am index e01b04bcd..c151cd6b2 100644 --- a/src/eitd/Makefile.am +++ b/src/eitd/Makefile.am @@ -20,5 +20,13 @@ endif AM_CPPFLAGS = -fno-rtti -fno-exceptions noinst_LIBRARIES = libsectionsd.a -libsectionsd_a_SOURCES = sectionsd.cpp debug.cpp dmx.cpp xmlutil.cpp \ - SIsections.cpp SIevents.cpp SIutils.cpp SIlanguage.cpp edvbstring.cpp +libsectionsd_a_SOURCES = \ + debug.cpp \ + dmx.cpp \ + edvbstring.cpp \ + sectionsd.cpp \ + SIevents.cpp \ + SIlanguage.cpp \ + SIsections.cpp \ + SIutils.cpp \ + xmlutil.cpp diff --git a/src/zapit/src/Makefile.am b/src/zapit/src/Makefile.am index 6e225eb3d..b63a0641f 100644 --- a/src/zapit/src/Makefile.am +++ b/src/zapit/src/Makefile.am @@ -21,9 +21,22 @@ endif noinst_LIBRARIES = libzapit.a libzapit_a_SOURCES = \ - bouquets.cpp channel.cpp dvbstring.cpp getservices.cpp \ - transponder.cpp scan.cpp zapit.cpp capmt.cpp frontend.cpp femanager.cpp \ - pat.cpp scanpmt.cpp fastscan.cpp scansdt.cpp scannit.cpp scanbat.cpp + bouquets.cpp \ + capmt.cpp \ + channel.cpp \ + dvbstring.cpp \ + fastscan.cpp \ + femanager.cpp \ + frontend.cpp \ + getservices.cpp \ + pat.cpp \ + scanbat.cpp \ + scan.cpp \ + scannit.cpp \ + scanpmt.cpp \ + scansdt.cpp \ + transponder.cpp \ + zapit.cpp bin_PROGRAMS = pzapit sbin_PROGRAMS = udpstreampes