diff --git a/Makefile.am b/Makefile.am index 11fccbf362b339e78405b5dab50d090e124cf680..d8952086b8ccc47e0e8ef87013cb4395fee69b17 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 fda17a225baafb22a418c816119e322d0b71c669..99eec615bf2c8d4b854ce80c09db302b73683fd6 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 2f5e1e5c2e5e5ab500880565b2b2cce19e382973..57401c1fa1fa1e450b8fcf67fe0b10e39580c1f7 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 b7064e5dd9b84c94326da5dddaba2e2455ca2776..b7f84139e15ba671df568d3c5802a2d6d67f5dd6 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 ee29a682e9dfc8d032c466aa60f7a310d785c8f8..3a85be6565b5a4834e8a7e05d41d2560178af7ad 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 cb26ade38f45011af62f5f278d1c7aa052e2bbf4..fd4e3a32f09f6e3c6a8be6b6bae1f032518b2ddb 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 58cf15885aa5b4e6ad203f344fd2eb5af720cd1c..848864b692542baab890c1c280570f09b753a540 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 bee4635ad226f41d57270d3104a0153ecd613f4d..c216e36c44eed10344795d781df40226c307127f 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 b26233d9b03649bc9c2d14dc7c88361b88158e40..66161b3184c51127deee958795741d8d88e7d83c 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 ce6f2ad100218ae5b055857f4c10810239bf42dc..39c9bcdaa9eb07b53d94571a4b9b2c1a1ee4ca73 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 be060ee9618ef6a077639d1c16a3041809b3f429..c30686629cbf82269f0daa3abb35dc47d1effa0f 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 54d900f26cc55179fbea1bed5481eef88bbbb252..846dda948598f6d9c9999de20bfe27e8d60d0069 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 782af065481759059cde0f080351cb4763f62411..b5c3ec0cf54a2e8553194d5b53caa26de751ea6f 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 a8fed9adfea088cb002dde553e556c62cd4b3997..4313987ed0c569613f4b5a555f24964b60607e20 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 36aed1ff2bc60e59e0a41986c3b3d208a1518a20..faa11ff40a1683f27fd130dbf46c27bd55f3d47b 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 f2ba42881f9dbdd0486d1665e87a603e152a4d9e..5997ce2684ea8c945e629b1c7439d5c98a7c4422 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 a0c53124c58ec623dd6ade02ebb470f20ce3503b..01ac6d7bd2f1de5f5ae931bea8edffac2f51cb69 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 0393a07d604870a04c89a2fb52354f3df6e53f2d..f651fc05d6435bcdf2dea685f32f434559b89474 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 5da22cf4f71dd1c874c34244814adde10c5af20a..f471e28a58e26389ddc9deb961778f040789d7d5 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 96be9b522d2d52a473dbe6a51d14a3232c55e8ff..f4f44aa903a207c9f9d17845d05f195ee7ff065f 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 fae0dd59d4830f006961531fcdfac2b072103a51..f4361b024e86ceed5f27c6796701e2d04275fa07 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 9e45320d6c6c057f69980ad8f503b72d0331cf5a..3451b694ce4a0aea1cca7f8c30c7dc0da4346f9b 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 ecbc4963858a1b4160395eaf92cdd62e66d469cb..0fc76be20bce5709a4f955f3dbbf2de9f2d843ce 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 24aebec25bc27f76f3642fc9d49a91b9bd5a674c..4c54d4eb7bb0e2c03c9b0f3b66a8c8383324e9f5 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 b94f7ce16c42c311b4bf497372183a8960552332..791c9e12c5eb4a75f9c917f90bedbea1e7ffa7ef 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 8321a993b0313a2f1bf8b85dc5964ebfc54e5829..87ae2f1826bd64904808da2da9232f72aa6ea24f 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 71f7b272b32ed48d248475fe878323ab160b4679..ded7512cf509e46bb3b3755bd61498ff81adaec7 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 353152f5bad0db32d683bd211054a596d4bd7a3b..60a07466cb11b5aa0266ae463a372e5e4b8d93bf 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