From 148b58f267d5410f6373f9f5cacdd5ba2fe47cce Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin <mthl@gnu.org> Date: Sun, 6 Nov 2016 13:58:51 +0100 Subject: [PATCH] build: Rename 'globals.mak' to 'globals.mk'. In GNU packages the '.mk' extension is commonly used for Makefile fragments. Moreover it allows Emacs to choose 'makefile-mode' automatically when opening it. Change-Id: Ia35e5471b6852226027f975395cd21834783674b Reviewed-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com> --- Makefile.am | 2 +- bin/dbus/Makefile.am | 2 +- bin/restcpp/Makefile.am | 2 +- doc/dbus-api/Makefile.am | 2 +- globals.mak => globals.mk | 0 src/Makefile.am | 2 +- src/client/Makefile.am | 2 +- src/im/Makefile.am | 2 +- src/media/Makefile.am | 2 +- src/media/audio/Makefile.am | 2 +- src/media/audio/alsa/Makefile.am | 2 +- src/media/audio/coreaudio/Makefile.am | 2 +- src/media/audio/jack/Makefile.am | 2 +- src/media/audio/opensl/Makefile.am | 2 +- src/media/audio/portaudio/Makefile.am | 2 +- src/media/audio/pulseaudio/Makefile.am | 2 +- src/media/audio/sound/Makefile.am | 2 +- src/media/video/Makefile.am | 2 +- src/media/video/androidvideo/Makefile.am | 2 +- src/media/video/osxvideo/Makefile.am | 2 +- src/media/video/test/Makefile.am | 2 +- src/media/video/v4l2/Makefile.am | 2 +- src/media/video/winvideo/Makefile.am | 2 +- src/ringdht/Makefile.am | 2 +- src/ringdht/eth/libdevcore/Makefile.am | 2 +- src/ringdht/eth/libdevcrypto/Makefile.am | 2 +- src/security/Makefile.am | 2 +- src/sip/Makefile.am | 2 +- src/upnp/Makefile.am | 2 +- 29 files changed, 28 insertions(+), 28 deletions(-) rename globals.mak => globals.mk (100%) diff --git a/Makefile.am b/Makefile.am index 11fccbf362..d8952086b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -include globals.mak +include globals.mk # Makefile.am diff --git a/bin/dbus/Makefile.am b/bin/dbus/Makefile.am index fda17a225b..99eec615bf 100644 --- a/bin/dbus/Makefile.am +++ b/bin/dbus/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk noinst_LTLIBRARIES = libclient_dbus.la diff --git a/bin/restcpp/Makefile.am b/bin/restcpp/Makefile.am index 2f5e1e5c2e..57401c1fa1 100644 --- a/bin/restcpp/Makefile.am +++ b/bin/restcpp/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk noinst_LTLIBRARIES = libclient_rest.la diff --git a/doc/dbus-api/Makefile.am b/doc/dbus-api/Makefile.am index b7064e5dd9..b7f84139e1 100644 --- a/doc/dbus-api/Makefile.am +++ b/doc/dbus-api/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk XSLTPROC=xsltproc --xinclude --nonet PYTHON=python diff --git a/globals.mak b/globals.mk similarity index 100% rename from globals.mak rename to globals.mk diff --git a/src/Makefile.am b/src/Makefile.am index ee29a682e9..3a85be6565 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -include ../globals.mak +include ../globals.mk RING_VIDEO_LIBS= diff --git a/src/client/Makefile.am b/src/client/Makefile.am index cb26ade38f..fd4e3a32f0 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk noinst_LTLIBRARIES = libclient.la diff --git a/src/im/Makefile.am b/src/im/Makefile.am index 58cf15885a..848864b692 100644 --- a/src/im/Makefile.am +++ b/src/im/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk noinst_LTLIBRARIES = libim.la diff --git a/src/media/Makefile.am b/src/media/Makefile.am index bee4635ad2..c216e36c44 100644 --- a/src/media/Makefile.am +++ b/src/media/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk noinst_LTLIBRARIES = libmedia.la diff --git a/src/media/audio/Makefile.am b/src/media/audio/Makefile.am index b26233d9b0..66161b3184 100644 --- a/src/media/audio/Makefile.am +++ b/src/media/audio/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk noinst_LTLIBRARIES = libaudio.la diff --git a/src/media/audio/alsa/Makefile.am b/src/media/audio/alsa/Makefile.am index ce6f2ad100..39c9bcdaa9 100644 --- a/src/media/audio/alsa/Makefile.am +++ b/src/media/audio/alsa/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk if BUILD_ALSA diff --git a/src/media/audio/coreaudio/Makefile.am b/src/media/audio/coreaudio/Makefile.am index be060ee961..c30686629c 100644 --- a/src/media/audio/coreaudio/Makefile.am +++ b/src/media/audio/coreaudio/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk if HAVE_OSX noinst_LTLIBRARIES = libcoreaudiolayer.la diff --git a/src/media/audio/jack/Makefile.am b/src/media/audio/jack/Makefile.am index 54d900f26c..846dda9485 100644 --- a/src/media/audio/jack/Makefile.am +++ b/src/media/audio/jack/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk if BUILD_JACK noinst_LTLIBRARIES = libjacklayer.la diff --git a/src/media/audio/opensl/Makefile.am b/src/media/audio/opensl/Makefile.am index 782af06548..b5c3ec0cf5 100644 --- a/src/media/audio/opensl/Makefile.am +++ b/src/media/audio/opensl/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk if BUILD_OPENSL diff --git a/src/media/audio/portaudio/Makefile.am b/src/media/audio/portaudio/Makefile.am index a8fed9adfe..4313987ed0 100644 --- a/src/media/audio/portaudio/Makefile.am +++ b/src/media/audio/portaudio/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk if BUILD_PORTAUDIO diff --git a/src/media/audio/pulseaudio/Makefile.am b/src/media/audio/pulseaudio/Makefile.am index 36aed1ff2b..faa11ff40a 100644 --- a/src/media/audio/pulseaudio/Makefile.am +++ b/src/media/audio/pulseaudio/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk if BUILD_PULSE diff --git a/src/media/audio/sound/Makefile.am b/src/media/audio/sound/Makefile.am index f2ba42881f..5997ce2684 100644 --- a/src/media/audio/sound/Makefile.am +++ b/src/media/audio/sound/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk noinst_LTLIBRARIES = libsound.la diff --git a/src/media/video/Makefile.am b/src/media/video/Makefile.am index a0c53124c5..01ac6d7bd2 100644 --- a/src/media/video/Makefile.am +++ b/src/media/video/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk SUBDIRS= test diff --git a/src/media/video/androidvideo/Makefile.am b/src/media/video/androidvideo/Makefile.am index 0393a07d60..f651fc05d6 100644 --- a/src/media/video/androidvideo/Makefile.am +++ b/src/media/video/androidvideo/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk noinst_LTLIBRARIES = libandroidvideo.la diff --git a/src/media/video/osxvideo/Makefile.am b/src/media/video/osxvideo/Makefile.am index 5da22cf4f7..f471e28a58 100644 --- a/src/media/video/osxvideo/Makefile.am +++ b/src/media/video/osxvideo/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk noinst_LTLIBRARIES = libosxvideo.la diff --git a/src/media/video/test/Makefile.am b/src/media/video/test/Makefile.am index 96be9b522d..f4f44aa903 100644 --- a/src/media/video/test/Makefile.am +++ b/src/media/video/test/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk TESTS=test_shm test_video_input test_video_rtp check_PROGRAMS=test_video_rtp test_video_input test_shm diff --git a/src/media/video/v4l2/Makefile.am b/src/media/video/v4l2/Makefile.am index fae0dd59d4..f4361b024e 100644 --- a/src/media/video/v4l2/Makefile.am +++ b/src/media/video/v4l2/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk noinst_LTLIBRARIES = libv4l2.la diff --git a/src/media/video/winvideo/Makefile.am b/src/media/video/winvideo/Makefile.am index 9e45320d6c..3451b694ce 100644 --- a/src/media/video/winvideo/Makefile.am +++ b/src/media/video/winvideo/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk noinst_LTLIBRARIES = libwinvideo.la diff --git a/src/ringdht/Makefile.am b/src/ringdht/Makefile.am index ecbc496385..0fc76be20b 100644 --- a/src/ringdht/Makefile.am +++ b/src/ringdht/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk SUBDIRS = eth/libdevcore eth/libdevcrypto diff --git a/src/ringdht/eth/libdevcore/Makefile.am b/src/ringdht/eth/libdevcore/Makefile.am index 24aebec25b..4c54d4eb7b 100644 --- a/src/ringdht/eth/libdevcore/Makefile.am +++ b/src/ringdht/eth/libdevcore/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk noinst_LTLIBRARIES = libdevcore.la libdevcore_la_CPPFLAGS = @CPPFLAGS@ -DBOOST_SYSTEM_NO_DEPRECATED diff --git a/src/ringdht/eth/libdevcrypto/Makefile.am b/src/ringdht/eth/libdevcrypto/Makefile.am index b94f7ce16c..791c9e12c5 100644 --- a/src/ringdht/eth/libdevcrypto/Makefile.am +++ b/src/ringdht/eth/libdevcrypto/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk AM_CPPFLAGS += -I../ noinst_LTLIBRARIES = libdevcrypto.la diff --git a/src/security/Makefile.am b/src/security/Makefile.am index 8321a993b0..87ae2f1826 100644 --- a/src/security/Makefile.am +++ b/src/security/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk noinst_LTLIBRARIES = libsecurity.la libsecurity_la_CXXFLAGS = @CXXFLAGS@ -I$(top_srcdir)/src diff --git a/src/sip/Makefile.am b/src/sip/Makefile.am index 71f7b272b3..ded7512cf5 100644 --- a/src/sip/Makefile.am +++ b/src/sip/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk noinst_LTLIBRARIES = libsiplink.la libsiplink_la_CXXFLAGS = @CXXFLAGS@ -I$(top_srcdir)/src diff --git a/src/upnp/Makefile.am b/src/upnp/Makefile.am index 353152f5ba..60a07466cb 100644 --- a/src/upnp/Makefile.am +++ b/src/upnp/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/globals.mak +include $(top_srcdir)/globals.mk noinst_LTLIBRARIES = libupnpcontrol.la -- GitLab