diff --git a/ChangeLog b/ChangeLog index c9b91cc4..9852496b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17542,3 +17542,5 @@ * Added support for the Spinitron v2 API in the 'spinitron_plus' RLM. 2018-08-29 Fred Gleason * Removed spurious syslog warnings when initializing HPI devices. +2018-08-30 Fred Gleason + * Moved RLM subsystem to 'apis/rlm/'. diff --git a/Makefile.am b/Makefile.am index 8eeb4b0f..d3c64e3c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,7 @@ endif SUBDIRS = icons\ helpers\ lib\ - $(HPI_RD_OPT) rlm\ + $(HPI_RD_OPT) apis\ scripts\ conf\ debian\ diff --git a/apis/Makefile.am b/apis/Makefile.am new file mode 100644 index 00000000..843d8892 --- /dev/null +++ b/apis/Makefile.am @@ -0,0 +1,38 @@ +## Makefile.am +## +## Makefile.am for rivendell/apis +## +## (C) Copyright 2018 Fred Gleason +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as +## published by the Free Software Foundation; either version 2 of +## the License, or (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public +## License along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +## +## Use automake to process this into a Makefile.in + +SUBDIRS = rlm + +CLEANFILES = *~\ + *.idb\ + *ilk\ + *.obj\ + *.pdb\ + *.qm\ + moc_* + +MAINTAINERCLEANFILES = *~\ + *.tar.gz\ + aclocal.m4\ + configure\ + Makefile.in\ + moc_* diff --git a/rlm/Makefile-example b/apis/rlm/Makefile-example similarity index 100% rename from rlm/Makefile-example rename to apis/rlm/Makefile-example diff --git a/rlm/Makefile.am b/apis/rlm/Makefile.am similarity index 100% rename from rlm/Makefile.am rename to apis/rlm/Makefile.am diff --git a/rlm/rlm.h b/apis/rlm/rlm.h similarity index 100% rename from rlm/rlm.h rename to apis/rlm/rlm.h diff --git a/rlm/rlm_ando.c b/apis/rlm/rlm_ando.c similarity index 100% rename from rlm/rlm_ando.c rename to apis/rlm/rlm_ando.c diff --git a/rlm/rlm_facebook.c b/apis/rlm/rlm_facebook.c similarity index 100% rename from rlm/rlm_facebook.c rename to apis/rlm/rlm_facebook.c diff --git a/rlm/rlm_filewrite.c b/apis/rlm/rlm_filewrite.c similarity index 100% rename from rlm/rlm_filewrite.c rename to apis/rlm/rlm_filewrite.c diff --git a/rlm/rlm_icecast2.c b/apis/rlm/rlm_icecast2.c similarity index 100% rename from rlm/rlm_icecast2.c rename to apis/rlm/rlm_icecast2.c diff --git a/rlm/rlm_inno713.c b/apis/rlm/rlm_inno713.c similarity index 100% rename from rlm/rlm_inno713.c rename to apis/rlm/rlm_inno713.c diff --git a/rlm/rlm_liqcomp.c b/apis/rlm/rlm_liqcomp.c similarity index 100% rename from rlm/rlm_liqcomp.c rename to apis/rlm/rlm_liqcomp.c diff --git a/rlm/rlm_live365.c b/apis/rlm/rlm_live365.c similarity index 100% rename from rlm/rlm_live365.c rename to apis/rlm/rlm_live365.c diff --git a/rlm/rlm_padpoint.c b/apis/rlm/rlm_padpoint.c similarity index 100% rename from rlm/rlm_padpoint.c rename to apis/rlm/rlm_padpoint.c diff --git a/rlm/rlm_serial.c b/apis/rlm/rlm_serial.c similarity index 100% rename from rlm/rlm_serial.c rename to apis/rlm/rlm_serial.c diff --git a/rlm/rlm_shoutcast1.c b/apis/rlm/rlm_shoutcast1.c similarity index 100% rename from rlm/rlm_shoutcast1.c rename to apis/rlm/rlm_shoutcast1.c diff --git a/rlm/rlm_spinitron_plus.c b/apis/rlm/rlm_spinitron_plus.c similarity index 100% rename from rlm/rlm_spinitron_plus.c rename to apis/rlm/rlm_spinitron_plus.c diff --git a/rlm/rlm_spottrap.c b/apis/rlm/rlm_spottrap.c similarity index 100% rename from rlm/rlm_spottrap.c rename to apis/rlm/rlm_spottrap.c diff --git a/rlm/rlm_tagstation.c b/apis/rlm/rlm_tagstation.c similarity index 100% rename from rlm/rlm_tagstation.c rename to apis/rlm/rlm_tagstation.c diff --git a/rlm/rlm_test.c b/apis/rlm/rlm_test.c similarity index 100% rename from rlm/rlm_test.c rename to apis/rlm/rlm_test.c diff --git a/rlm/rlm_tunein.c b/apis/rlm/rlm_tunein.c similarity index 100% rename from rlm/rlm_tunein.c rename to apis/rlm/rlm_tunein.c diff --git a/rlm/rlm_twitter.c b/apis/rlm/rlm_twitter.c similarity index 100% rename from rlm/rlm_twitter.c rename to apis/rlm/rlm_twitter.c diff --git a/rlm/rlm_udp.c b/apis/rlm/rlm_udp.c similarity index 100% rename from rlm/rlm_udp.c rename to apis/rlm/rlm_udp.c diff --git a/rlm/rlm_urlwrite.c b/apis/rlm/rlm_urlwrite.c similarity index 100% rename from rlm/rlm_urlwrite.c rename to apis/rlm/rlm_urlwrite.c diff --git a/rlm/rlm_walltime.c b/apis/rlm/rlm_walltime.c similarity index 100% rename from rlm/rlm_walltime.c rename to apis/rlm/rlm_walltime.c diff --git a/rlm/rlm_xds.c b/apis/rlm/rlm_xds.c similarity index 100% rename from rlm/rlm_xds.c rename to apis/rlm/rlm_xds.c diff --git a/rlm/rlm_xmpad.c b/apis/rlm/rlm_xmpad.c similarity index 100% rename from rlm/rlm_xmpad.c rename to apis/rlm/rlm_xmpad.c diff --git a/configure.ac b/configure.ac index fcb16da0..c4a357d0 100644 --- a/configure.ac +++ b/configure.ac @@ -441,10 +441,11 @@ AC_CONFIG_FILES([rivendell.spec \ conf/rd-bin.conf \ icons/Makefile \ helpers/Makefile \ + apis/Makefile \ + apis/rlm/Makefile \ lib/rdpaths.h \ lib/Makefile \ rdhpi/Makefile \ - rlm/Makefile \ cae/Makefile \ utils/Makefile \ utils/rdalsaconfig/Makefile \