GNOME.org
 

[rhythmbox] build: remove HAVE_CONFIG_H

commit 2aa8a4c69c1a77ff1052ac234f14ad250233d2b8
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Jan 18 21:18:56 2022 +1000

    build: remove HAVE_CONFIG_H
    
    we always have config.h, no point checking for it all over the place

 plugins/android/meson.build                             | 1 -
 plugins/android/rb-android-plugin.c                     | 2 --
 plugins/audioscrobbler/meson.build                      | 1 -
 plugins/audioscrobbler/rb-audioscrobbler-plugin.c       | 2 --
 plugins/audioscrobbler/rb-audioscrobbler-profile-page.c | 2 --
 plugins/brasero-disc-recorder/meson.build               | 1 -
 plugins/daap/meson.build                                | 2 +-
 plugins/daap/rb-daap-plugin.c                           | 2 --
 plugins/daap/rb-rhythmdb-dmap-db-adapter.c              | 2 --
 plugins/dbus-media-server/meson.build                   | 1 -
 plugins/fmradio/meson.build                             | 1 -
 plugins/generic-player/meson.build                      | 1 -
 plugins/generic-player/rb-generic-player-plugin.c       | 2 --
 plugins/grilo/meson.build                               | 1 -
 plugins/ipod/meson.build                                | 1 -
 plugins/ipod/rb-ipod-helpers.c                          | 2 --
 plugins/ipod/rb-ipod-plugin.c                           | 2 --
 plugins/iradio/meson.build                              | 1 -
 plugins/iradio/rb-iradio-plugin.c                       | 2 --
 plugins/lirc/meson.build                                | 1 -
 plugins/lirc/rb-lirc-plugin.c                           | 2 --
 plugins/mtpdevice/meson.build                           | 1 -
 plugins/mtpdevice/rb-mtp-plugin.c                       | 2 --
 plugins/notification/meson.build                        | 1 -
 plugins/power-manager/meson.build                       | 1 -
 sample-plugins/sample-vala/meson.build                  | 1 -
 sample-plugins/sample/meson.build                       | 1 -
 sample-plugins/sample/rb-sample-plugin.c                | 2 --
 widgets/eggwrapbox.c                                    | 2 --
 widgets/rb-segmented-bar.c                              | 3 +--
 30 files changed, 2 insertions(+), 44 deletions(-)
---
diff --git a/plugins/android/meson.build b/plugins/android/meson.build
index 5f9da96a1..d98ff6dcb 100644
--- a/plugins/android/meson.build
+++ b/plugins/android/meson.build
@@ -11,7 +11,6 @@ android_sources = [
 
 shared_module('android',
   android_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: [rhythmbox_core_dep, gudev],
   include_directories: pluginsinc,
   install: true,
diff --git a/plugins/android/rb-android-plugin.c b/plugins/android/rb-android-plugin.c
index f2d75f297..8704a8539 100644
--- a/plugins/android/rb-android-plugin.c
+++ b/plugins/android/rb-android-plugin.c
@@ -28,9 +28,7 @@
 
 #define __EXTENSIONS__
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h> /* For strlen */
 #include <glib/gi18n-lib.h>
diff --git a/plugins/audioscrobbler/meson.build b/plugins/audioscrobbler/meson.build
index 8a6577b21..9dae8f960 100644
--- a/plugins/audioscrobbler/meson.build
+++ b/plugins/audioscrobbler/meson.build
@@ -19,7 +19,6 @@ audioscrobbler_test_sources = [
 
 shared_module('audioscrobbler',
   audioscrobbler_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: [rhythmbox_core_dep, json_glib, totem_plparser],
   install: true,
   install_dir: audioscrobbler_plugin_dir)
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-plugin.c 
b/plugins/audioscrobbler/rb-audioscrobbler-plugin.c
index 8d62557f8..f822c0710 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-plugin.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-plugin.c
@@ -26,9 +26,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-profile-page.c 
b/plugins/audioscrobbler/rb-audioscrobbler-profile-page.c
index 15a20af85..44806f960 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-profile-page.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-profile-page.c
@@ -26,9 +26,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff --git a/plugins/brasero-disc-recorder/meson.build b/plugins/brasero-disc-recorder/meson.build
index be0301d27..34913ad32 100644
--- a/plugins/brasero-disc-recorder/meson.build
+++ b/plugins/brasero-disc-recorder/meson.build
@@ -7,7 +7,6 @@ brasero_disc_recorder_sources = [
 
 shared_module('cd-recorder',
   brasero_disc_recorder_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: [rhythmbox_core_dep, brasero_media],
   install: true,
   install_dir: brasero_disc_recorder_plugin_dir)
diff --git a/plugins/daap/meson.build b/plugins/daap/meson.build
index d433b4bb6..b6c6491f3 100644
--- a/plugins/daap/meson.build
+++ b/plugins/daap/meson.build
@@ -22,7 +22,7 @@ daap_sources = [
 ]
 
 daap_dependencies = [rhythmbox_core_dep, pango]
-args = ['-DHAVE_CONFIG_H']
+args = []
 
 if libdmapsharing4.found()
   daap_dependencies += libdmapsharing4
diff --git a/plugins/daap/rb-daap-plugin.c b/plugins/daap/rb-daap-plugin.c
index f0570b100..a6284db51 100644
--- a/plugins/daap/rb-daap-plugin.c
+++ b/plugins/daap/rb-daap-plugin.c
@@ -26,9 +26,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h>
 #include <glib.h>
diff --git a/plugins/daap/rb-rhythmdb-dmap-db-adapter.c b/plugins/daap/rb-rhythmdb-dmap-db-adapter.c
index 1212b4baf..f016c0f39 100644
--- a/plugins/daap/rb-rhythmdb-dmap-db-adapter.c
+++ b/plugins/daap/rb-rhythmdb-dmap-db-adapter.c
@@ -27,9 +27,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "rhythmdb.h"
 #include "rb-rhythmdb-dmap-db-adapter.h"
diff --git a/plugins/dbus-media-server/meson.build b/plugins/dbus-media-server/meson.build
index 01dcc75a8..97f40ca42 100644
--- a/plugins/dbus-media-server/meson.build
+++ b/plugins/dbus-media-server/meson.build
@@ -7,7 +7,6 @@ dbus_media_server_sources = [
 
 shared_module('dbus-media-server',
   dbus_media_server_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: [rhythmbox_core_dep],
   install: true,
   install_dir: dbus_media_server_plugin_dir)
diff --git a/plugins/fmradio/meson.build b/plugins/fmradio/meson.build
index c4f08fe20..25cc100c2 100644
--- a/plugins/fmradio/meson.build
+++ b/plugins/fmradio/meson.build
@@ -15,7 +15,6 @@ fmradio_sources = [
 
 shared_module('fmradio',
   fmradio_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: [rhythmbox_core_dep],
   install: true,
   install_dir: fmradio_plugin_dir)
diff --git a/plugins/generic-player/meson.build b/plugins/generic-player/meson.build
index 86a99d534..9199024a0 100644
--- a/plugins/generic-player/meson.build
+++ b/plugins/generic-player/meson.build
@@ -15,7 +15,6 @@ generic_player_sources = [
 
 shared_module('generic-player',
   generic_player_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: [rhythmbox_core_dep],
   install: true,
   install_dir: generic_player_plugin_dir)
diff --git a/plugins/generic-player/rb-generic-player-plugin.c 
b/plugins/generic-player/rb-generic-player-plugin.c
index 8a988bbff..c61ce49f1 100644
--- a/plugins/generic-player/rb-generic-player-plugin.c
+++ b/plugins/generic-player/rb-generic-player-plugin.c
@@ -28,9 +28,7 @@
 
 #define __EXTENSIONS__
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h> /* For strlen */
 #include <glib/gi18n-lib.h>
diff --git a/plugins/grilo/meson.build b/plugins/grilo/meson.build
index 11184f342..f843ee611 100644
--- a/plugins/grilo/meson.build
+++ b/plugins/grilo/meson.build
@@ -10,7 +10,6 @@ grilo_dependencies = [rhythmbox_core_dep, grilo]
 
 shared_module('grilo',
   grilo_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: grilo_dependencies,
   install: true,
   install_dir: grilo_plugin_dir)
diff --git a/plugins/ipod/meson.build b/plugins/ipod/meson.build
index 58a207ebe..6c03fa792 100644
--- a/plugins/ipod/meson.build
+++ b/plugins/ipod/meson.build
@@ -18,7 +18,6 @@ ipod_dependencies = [rhythmbox_core_dep, libgpod]
 
 shared_module('ipod',
   ipod_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: ipod_dependencies,
   install: true,
   install_dir: ipod_plugin_dir)
diff --git a/plugins/ipod/rb-ipod-helpers.c b/plugins/ipod/rb-ipod-helpers.c
index d06ab1a31..32172b5a3 100644
--- a/plugins/ipod/rb-ipod-helpers.c
+++ b/plugins/ipod/rb-ipod-helpers.c
@@ -28,9 +28,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h>
 
diff --git a/plugins/ipod/rb-ipod-plugin.c b/plugins/ipod/rb-ipod-plugin.c
index 6ca8ede41..c511ee286 100644
--- a/plugins/ipod/rb-ipod-plugin.c
+++ b/plugins/ipod/rb-ipod-plugin.c
@@ -26,9 +26,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <glib/gi18n-lib.h>
 #include <gmodule.h>
diff --git a/plugins/iradio/meson.build b/plugins/iradio/meson.build
index 05b888435..3616d9988 100644
--- a/plugins/iradio/meson.build
+++ b/plugins/iradio/meson.build
@@ -17,7 +17,6 @@ iradio_dependencies = [rhythmbox_core_dep]
 
 shared_module('iradio',
   iradio_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: iradio_dependencies,
   install: true,
   install_dir: iradio_plugin_dir)
diff --git a/plugins/iradio/rb-iradio-plugin.c b/plugins/iradio/rb-iradio-plugin.c
index 0cedded41..0e13d0054 100644
--- a/plugins/iradio/rb-iradio-plugin.c
+++ b/plugins/iradio/rb-iradio-plugin.c
@@ -27,9 +27,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
diff --git a/plugins/lirc/meson.build b/plugins/lirc/meson.build
index 0fac747cc..a70be96a6 100644
--- a/plugins/lirc/meson.build
+++ b/plugins/lirc/meson.build
@@ -7,7 +7,6 @@ lirc_sources = [
 
 shared_module('rblirc',
   lirc_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: [rhythmbox_core_dep, lirc],
   install_dir: lirc_plugin_dir,
   install: true)
diff --git a/plugins/lirc/rb-lirc-plugin.c b/plugins/lirc/rb-lirc-plugin.c
index 9176eccf2..38190371a 100644
--- a/plugins/lirc/rb-lirc-plugin.c
+++ b/plugins/lirc/rb-lirc-plugin.c
@@ -26,9 +26,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h>
 #include <unistd.h>
diff --git a/plugins/mtpdevice/meson.build b/plugins/mtpdevice/meson.build
index 769f7a857..1dd577649 100644
--- a/plugins/mtpdevice/meson.build
+++ b/plugins/mtpdevice/meson.build
@@ -23,7 +23,6 @@ endif
 
 shared_module('mtpdevice',
   mtpdevice_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: mtpdevice_dependencies,
   install: true,
   install_dir: mtpdevice_plugin_dir)
diff --git a/plugins/mtpdevice/rb-mtp-plugin.c b/plugins/mtpdevice/rb-mtp-plugin.c
index 525bd15da..9a31a8e55 100644
--- a/plugins/mtpdevice/rb-mtp-plugin.c
+++ b/plugins/mtpdevice/rb-mtp-plugin.c
@@ -26,9 +26,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
diff --git a/plugins/notification/meson.build b/plugins/notification/meson.build
index 16fc078da..a60e746ee 100644
--- a/plugins/notification/meson.build
+++ b/plugins/notification/meson.build
@@ -6,7 +6,6 @@ notification_sources = [
 shared_module('notification',
   notification_sources,
   dependencies: [rhythmbox_core_dep, libnotify, pango],
-  c_args: ['-DHAVE_CONFIG_H'],
   include_directories: pluginsinc,
   install: true,
   install_dir: notification_plugin_dir)
diff --git a/plugins/power-manager/meson.build b/plugins/power-manager/meson.build
index 76583e3b4..2c92539ea 100644
--- a/plugins/power-manager/meson.build
+++ b/plugins/power-manager/meson.build
@@ -7,7 +7,6 @@ power_manager_sources = [
 
 shared_module('power-manager',
   power_manager_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: [rhythmbox_core_dep],
   install: true,
   install_dir: power_manager_plugin_dir)
diff --git a/sample-plugins/sample-vala/meson.build b/sample-plugins/sample-vala/meson.build
index a1d3e29d1..d989c0408 100644
--- a/sample-plugins/sample-vala/meson.build
+++ b/sample-plugins/sample-vala/meson.build
@@ -16,7 +16,6 @@ vala_deps = [
 
 shared_module('sample-vala',
   sample_vala_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: vala_deps,
   install_dir: sample_vala_plugin_dir,
   install: true)
diff --git a/sample-plugins/sample/meson.build b/sample-plugins/sample/meson.build
index aff5cea2b..8bdbad060 100644
--- a/sample-plugins/sample/meson.build
+++ b/sample-plugins/sample/meson.build
@@ -6,7 +6,6 @@ sample_sources = [
 
 shared_module('sample',
   sample_sources,
-  c_args: ['-DHAVE_CONFIG_H'],
   dependencies: [rhythmbox_core_dep],
   install_dir: sample_plugin_dir,
   install: true)
diff --git a/sample-plugins/sample/rb-sample-plugin.c b/sample-plugins/sample/rb-sample-plugin.c
index a97ac477c..46f996026 100644
--- a/sample-plugins/sample/rb-sample-plugin.c
+++ b/sample-plugins/sample/rb-sample-plugin.c
@@ -26,9 +26,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h> /* For strlen */
 #include <glib/gi18n-lib.h>
diff --git a/widgets/eggwrapbox.c b/widgets/eggwrapbox.c
index 16d598da4..11d69648b 100644
--- a/widgets/eggwrapbox.c
+++ b/widgets/eggwrapbox.c
@@ -38,9 +38,7 @@
  * Unlike a GtkTable, the child widgets do not need to align in a grid.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "eggwrapbox.h"
 #include "eggwrapbox-enums.h"
diff --git a/widgets/rb-segmented-bar.c b/widgets/rb-segmented-bar.c
index 14e99ff72..8d9915efd 100644
--- a/widgets/rb-segmented-bar.c
+++ b/widgets/rb-segmented-bar.c
@@ -27,9 +27,8 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
 #include <math.h>
 #include <locale.h>
 #include <cairo/cairo.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]