From b297c89c1bb35d0166ff24367591113a174fddf0 Mon Sep 17 00:00:00 2001 From: Olivier Dion Date: Fri, 13 Aug 2021 16:49:15 -0400 Subject: [PATCH] build: Use non-recursive Automake. Change-Id: I8d5eaf4c90cb425e8f96eaac25e727b6a6aae24f --- .gitignore | 1 + configure.ac | 29 ----- src/Makefile.am | 110 +++++++------------ src/client/Makefile.am | 28 ++--- src/config/Makefile.am | 10 +- src/im/Makefile.am | 10 +- src/jamidht/Makefile.am | 88 +++++++-------- src/jamidht/eth/libdevcore/Makefile.am | 24 ++-- src/jamidht/eth/libdevcrypto/Makefile.am | 9 +- src/media/Makefile.am | 97 ++++++++-------- src/media/audio/Makefile.am | 134 +++++++++-------------- src/media/audio/alsa/Makefile.am | 12 +- src/media/audio/coreaudio/Makefile.am | 21 +++- src/media/audio/echo-cancel/Makefile.am | 22 ++-- src/media/audio/jack/Makefile.am | 12 +- src/media/audio/opensl/Makefile.am | 20 ++-- src/media/audio/portaudio/Makefile.am | 15 +-- src/media/audio/pulseaudio/Makefile.am | 18 ++- src/media/audio/sound/Makefile.am | 28 ++--- src/media/video/Makefile.am | 83 +++++++------- src/media/video/androidvideo/Makefile.am | 10 +- src/media/video/iosvideo/Makefile.am | 10 +- src/media/video/osxvideo/Makefile.am | 12 +- src/media/video/v4l2/Makefile.am | 12 +- src/media/video/winvideo/Makefile.am | 14 +-- src/plugin/Makefile.am | 46 ++++---- src/security/Makefile.am | 25 +++-- src/sip/Makefile.am | 49 ++++----- src/upnp/Makefile.am | 19 ++-- src/upnp/protocol/Makefile.am | 33 ++---- src/upnp/protocol/natpmp/Makefile.am | 14 +-- src/upnp/protocol/pupnp/Makefile.am | 14 +-- 32 files changed, 469 insertions(+), 560 deletions(-) diff --git a/.gitignore b/.gitignore index 9a2aed39b..c9deae36c 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ stamp-h1 ltmain.sh INSTALL build +.dirstamp # Binary translation files *.mo diff --git a/configure.ac b/configure.ac index 9af84db15..0706f2d46 100644 --- a/configure.ac +++ b/configure.ac @@ -636,35 +636,6 @@ BB_ENABLE_DOXYGEN AC_CONFIG_FILES([Makefile \ bin/Makefile \ src/Makefile \ - src/sip/Makefile \ - src/im/Makefile \ - src/jamidht/Makefile \ - src/jamidht/eth/libdevcore/Makefile \ - src/jamidht/eth/libdevcrypto/Makefile \ - src/media/Makefile \ - src/media/audio/Makefile \ - src/media/audio/pulseaudio/Makefile \ - src/media/audio/alsa/Makefile \ - src/media/audio/opensl/Makefile \ - src/media/audio/jack/Makefile \ - src/media/audio/coreaudio/Makefile \ - src/media/audio/portaudio/Makefile \ - src/media/audio/sound/Makefile \ - src/media/audio/echo-cancel/Makefile \ - src/config/Makefile \ - src/client/Makefile \ - src/media/video/Makefile \ - src/media/video/v4l2/Makefile \ - src/media/video/androidvideo/Makefile \ - src/media/video/osxvideo/Makefile \ - src/media/video/iosvideo/Makefile \ - src/media/video/winvideo/Makefile \ - src/plugin/Makefile \ - src/security/Makefile \ - src/upnp/Makefile \ - src/upnp/protocol/Makefile \ - src/upnp/protocol/natpmp/Makefile \ - src/upnp/protocol/pupnp/Makefile \ ringtones/Makefile \ test/Makefile\ test/sip/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 38eb82d23..f2f47fcd2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,59 +1,29 @@ -include ../globals.mk +include $(top_srcdir)/globals.mk -ENABLE_PLUGIN_LIBS= - -if ENABLE_PLUGIN -ENABLE_PLUGIN_LIBS+=./plugin/libplugin.la -endif - -ENABLE_VIDEO_LIBS= - -if ENABLE_VIDEO -ENABLE_VIDEO_LIBS+=./media/video/libvideo.la -if HAVE_LINUX -if HAVE_ANDROID -ENABLE_VIDEO_LIBS+= \ - ./media/video/androidvideo/libandroidvideo.la -else -ENABLE_VIDEO_LIBS+= \ - ./media/video/v4l2/libv4l2.la -endif -endif if HAVE_OSX -ENABLE_VIDEO_LIBS+= \ - ./media/video/osxvideo/libosxvideo.la -endif -if HAVE_IOS -ENABLE_VIDEO_LIBS+= \ - ./media/video/iosvideo/libiosvideo.la -endif -if HAVE_WIN32 -ENABLE_VIDEO_LIBS+= \ - ./media/video/winvideo/libwinvideo.la -endif +AM_OBJCXXFLAGS=-std=c++17 endif -SUBDIRS = client media config sip upnp security jamidht im $(ENABLE_VIDEO_SUBDIR) +noinst_LTLIBRARIES= +noinst_HEADERS= +nobase_include_HEADERS= -if ENABLE_PLUGIN -SUBDIRS+=plugin -endif +lib_LTLIBRARIES = libring.la +libring_la_LIBADD= + +include ./client/Makefile.am +include ./media/Makefile.am +include ./config/Makefile.am +include ./sip/Makefile.am +include ./upnp/Makefile.am +include ./security/Makefile.am +include ./jamidht/Makefile.am +include ./im/Makefile.am +include ./plugin/Makefile.am # libring -lib_LTLIBRARIES = libring.la - -libring_la_LIBADD = \ - ./sip/libsiplink.la \ - ./media/libmedia.la \ - ./client/libclient.la \ - ./config/libconfig.la \ - ./security/libsecurity.la \ - ./upnp/libupnpcontrol.la \ - ./jamidht/libringacc.la \ - ./im/libim.la \ - $(ENABLE_PLUGIN_LIBS) \ - $(ENABLE_VIDEO_LIBS) \ +libring_la_LIBADD += \ $(ALSA_LIBS) \ $(PULSEAUDIO_LIBS) \ $(PORTAUDIO_LIBS) \ @@ -82,11 +52,9 @@ libring_la_LIBADD = \ if ENABLE_PLUGIN if HAVE_OSX -libring_la_LIBADD += \ - $(MINIZIP_LIBS) +libring_la_LIBADD += $(MINIZIP_LIBS) else -libring_la_LIBADD += \ - $(ARCHIVE_LIBS) +libring_la_LIBADD += $(ARCHIVE_LIBS) endif endif @@ -162,8 +130,8 @@ libring_la_SOURCES = \ scheduled_executor.h \ scheduled_executor.cpp \ transport/peer_channel.h \ - uri.h \ - uri.cpp \ + uri.h \ + uri.cpp \ vcard.h if HAVE_WIN32 @@ -172,25 +140,25 @@ libring_la_SOURCES += \ winsyslog.c endif -nobase_include_HEADERS = \ - jami/account_const.h \ - jami/call_const.h \ - jami/callmanager_interface.h \ - jami/configurationmanager_interface.h \ - jami/conversation_interface.h \ - jami/datatransfer_interface.h \ - jami/def.h \ - jami/jami.h \ - jami/media_const.h \ - jami/presence_const.h \ - jami/presencemanager_interface.h \ - jami/security_const.h +nobase_include_HEADERS += \ + ./jami/account_const.h \ + ./jami/call_const.h \ + ./jami/callmanager_interface.h \ + ./jami/configurationmanager_interface.h \ + ./jami/conversation_interface.h \ + ./jami/datatransfer_interface.h \ + ./jami/def.h \ + ./jami/jami.h \ + ./jami/media_const.h \ + ./jami/presence_const.h \ + ./jami/presencemanager_interface.h \ + ./jami/security_const.h if ENABLE_PLUGIN -nobase_include_HEADERS+= \ - jami/plugin_manager_interface.h +nobase_include_HEADERS += \ + ./jami/plugin_manager_interface.h endif if ENABLE_VIDEO -nobase_include_HEADERS+= \ - jami/videomanager_interface.h +nobase_include_HEADERS += \ + ./jami/videomanager_interface.h endif diff --git a/src/client/Makefile.am b/src/client/Makefile.am index ad0366f0b..b17892dba 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -1,27 +1,27 @@ -include $(top_srcdir)/globals.mk +noinst_LTLIBRARIES += libclient.la -noinst_LTLIBRARIES = libclient.la +noinst_HEADERS += \ + ./client/ring_signal.h -noinst_HEADERS = \ - ring_signal.h - -PRESENCE_SRC = presencemanager.cpp +PRESENCE_SRC = ./client/presencemanager.cpp if ENABLE_VIDEO -VIDEO_SRC = videomanager.cpp -noinst_HEADERS += videomanager.h +VIDEO_SRC = ./client/videomanager.cpp +noinst_HEADERS += ./client/videomanager.h endif if ENABLE_PLUGIN -PLUGIN_SRC = plugin_manager_interface.cpp +PLUGIN_SRC = ./client/plugin_manager_interface.cpp endif libclient_la_SOURCES = \ - ring_signal.cpp \ - callmanager.cpp \ - configurationmanager.cpp \ - datatransfer.cpp \ - conversation_interface.cpp \ + ./client/ring_signal.cpp \ + ./client/callmanager.cpp \ + ./client/configurationmanager.cpp \ + ./client/datatransfer.cpp \ + ./client/conversation_interface.cpp \ $(PLUGIN_SRC) \ $(PRESENCE_SRC) \ $(VIDEO_SRC) + +libring_la_LIBADD += libclient.la diff --git a/src/config/Makefile.am b/src/config/Makefile.am index eb392c2c7..06d9a02c9 100644 --- a/src/config/Makefile.am +++ b/src/config/Makefile.am @@ -1,4 +1,8 @@ -include $(top_srcdir)/globals.mk +noinst_LTLIBRARIES += libconfig.la -noinst_LTLIBRARIES = libconfig.la -libconfig_la_SOURCES = serializable.h yamlparser.h yamlparser.cpp +libconfig_la_SOURCES = \ + ./config/serializable.h \ + ./config/yamlparser.h \ + ./config/yamlparser.cpp + +libring_la_LIBADD += libconfig.la diff --git a/src/im/Makefile.am b/src/im/Makefile.am index e0827d8ee..deb07f372 100644 --- a/src/im/Makefile.am +++ b/src/im/Makefile.am @@ -1,5 +1,9 @@ -include $(top_srcdir)/globals.mk +noinst_LTLIBRARIES += libim.la -noinst_LTLIBRARIES = libim.la +libim_la_SOURCES = \ + ./im/instant_messaging.cpp \ + ./im/message_engine.cpp \ + ./im/instant_messaging.h \ + ./im/message_engine.h -libim_la_SOURCES = instant_messaging.cpp message_engine.cpp instant_messaging.h message_engine.h +libring_la_LIBADD += libim.la diff --git a/src/jamidht/Makefile.am b/src/jamidht/Makefile.am index b0ee274bd..ccf590b0a 100644 --- a/src/jamidht/Makefile.am +++ b/src/jamidht/Makefile.am @@ -1,54 +1,54 @@ -include $(top_srcdir)/globals.mk +noinst_LTLIBRARIES += libringacc.la -SUBDIRS = eth/libdevcore eth/libdevcrypto +libringacc_la_LIBADD= AM_CPPFLAGS += -I$(top_srcdir)/src/jamidht/eth -noinst_LTLIBRARIES = libringacc.la - -libringacc_la_LIBADD = ./eth/libdevcore/libdevcore.la \ - ./eth/libdevcrypto/libdevcrypto.la - libringacc_la_SOURCES = \ - abstract_sip_transport.h \ - jamiaccount.cpp \ - jamiaccount.h \ - connectionmanager.h \ - connectionmanager.cpp \ - channeled_transport.h \ - channeled_transport.cpp \ - channeled_transfers.h \ - channeled_transfers.cpp \ - conversation.h \ - conversation.cpp \ - conversationrepository.h \ - conversationrepository.cpp \ - gitserver.h \ - gitserver.cpp \ - channel_handler.h \ - conversation_channel_handler.h \ - conversation_channel_handler.cpp \ - conversation_module.h \ - conversation_module.cpp \ - multiplexed_socket.h \ - multiplexed_socket.cpp \ - accountarchive.cpp \ - accountarchive.h \ - p2p.cpp \ - p2p.h \ - contact_list.h \ - contact_list.cpp \ - account_manager.h \ - account_manager.cpp \ - archive_account_manager.h \ - archive_account_manager.cpp \ - server_account_manager.h \ - server_account_manager.cpp + ./jamidht/abstract_sip_transport.h \ + ./jamidht/jamiaccount.cpp \ + ./jamidht/jamiaccount.h \ + ./jamidht/connectionmanager.h \ + ./jamidht/connectionmanager.cpp \ + ./jamidht/channeled_transport.h \ + ./jamidht/channeled_transport.cpp \ + ./jamidht/channeled_transfers.h \ + ./jamidht/channeled_transfers.cpp \ + ./jamidht/conversation.h \ + ./jamidht/conversation.cpp \ + ./jamidht/conversationrepository.h \ + ./jamidht/conversationrepository.cpp \ + ./jamidht/gitserver.h \ + ./jamidht/gitserver.cpp \ + ./jamidht/channel_handler.h \ + ./jamidht/conversation_channel_handler.h \ + ./jamidht/conversation_channel_handler.cpp \ + ./jamidht/conversation_module.h \ + ./jamidht/conversation_module.cpp \ + ./jamidht/multiplexed_socket.h \ + ./jamidht/multiplexed_socket.cpp \ + ./jamidht/accountarchive.cpp \ + ./jamidht/accountarchive.h \ + ./jamidht/p2p.cpp \ + ./jamidht/p2p.h \ + ./jamidht/contact_list.h \ + ./jamidht/contact_list.cpp \ + ./jamidht/account_manager.h \ + ./jamidht/account_manager.cpp \ + ./jamidht/archive_account_manager.h \ + ./jamidht/archive_account_manager.cpp \ + ./jamidht/server_account_manager.h \ + ./jamidht/server_account_manager.cpp if RINGNS libringacc_la_SOURCES += \ - namedirectory.cpp \ - namedirectory.h + ./jamidht/namedirectory.cpp \ + ./jamidht/namedirectory.h endif -nobase_include_HEADERS= jami_contact.h +include ./jamidht/eth/libdevcore/Makefile.am +include ./jamidht/eth/libdevcrypto/Makefile.am + +nobase_include_HEADERS += ./jamidht/jami_contact.h + +libring_la_LIBADD += libringacc.la diff --git a/src/jamidht/eth/libdevcore/Makefile.am b/src/jamidht/eth/libdevcore/Makefile.am index ae0cd6f48..d78f50fc8 100644 --- a/src/jamidht/eth/libdevcore/Makefile.am +++ b/src/jamidht/eth/libdevcore/Makefile.am @@ -1,14 +1,16 @@ -include $(top_srcdir)/globals.mk +noinst_LTLIBRARIES += libdevcore.la -noinst_LTLIBRARIES = libdevcore.la +libdevcore_la_SOURCES = \ + ./jamidht/eth/libdevcore/FixedHash.cpp \ + ./jamidht/eth/libdevcore/Common.cpp \ + ./jamidht/eth/libdevcore/SHA3.cpp \ + ./jamidht/eth/libdevcore/CommonData.cpp -libdevcore_la_SOURCES = FixedHash.cpp \ - Common.cpp \ - SHA3.cpp \ - CommonData.cpp +noinst_HEADERS += \ + ./jamidht/eth/libdevcore/FixedHash.h \ + ./jamidht/eth/libdevcore/Common.h \ + ./jamidht/eth/libdevcore/SHA3.h \ + ./jamidht/eth/libdevcore/CommonData.h \ + ./jamidht/eth/libdevcore/Address.h -noinst_HEADERS = FixedHash.h \ - Common.h \ - SHA3.h \ - CommonData.h \ - Address.h +libringacc_la_LIBADD += libdevcore.la diff --git a/src/jamidht/eth/libdevcrypto/Makefile.am b/src/jamidht/eth/libdevcrypto/Makefile.am index 425659f87..4d58a63fc 100644 --- a/src/jamidht/eth/libdevcrypto/Makefile.am +++ b/src/jamidht/eth/libdevcrypto/Makefile.am @@ -1,7 +1,6 @@ -include $(top_srcdir)/globals.mk +noinst_LTLIBRARIES += libdevcrypto.la -AM_CPPFLAGS += -I$(top_srcdir)/src/jamidht/eth -noinst_LTLIBRARIES = libdevcrypto.la +libdevcrypto_la_SOURCES = ./jamidht/eth/libdevcrypto/Common.cpp +noinst_HEADERS += ./jamidht/eth/libdevcrypto/Common.h -libdevcrypto_la_SOURCES = Common.cpp -noinst_HEADERS = Common.h +libringacc_la_LIBADD += libdevcrypto.la diff --git a/src/media/Makefile.am b/src/media/Makefile.am index 7ca80f36e..35d1bf8ff 100644 --- a/src/media/Makefile.am +++ b/src/media/Makefile.am @@ -1,59 +1,50 @@ -include $(top_srcdir)/globals.mk +noinst_LTLIBRARIES += libmedia.la -noinst_LTLIBRARIES = libmedia.la - -SUBDIRS = audio - -if ENABLE_VIDEO -SUBDIRS += video -endif +libmedia_la_LIBADD= libmedia_la_SOURCES = \ - libav_utils.cpp \ - socket_pair.cpp \ - media_buffer.cpp \ - media_decoder.cpp \ - media_encoder.cpp \ - media_io_handle.cpp \ - media_codec.cpp \ - media_attribute.cpp \ - system_codec_container.cpp \ - srtp.c \ - recordable.cpp \ - media_filter.cpp \ - media_recorder.cpp \ - localrecorder.cpp \ - media_player.cpp \ - localrecordermanager.cpp \ - congestion_control.cpp + ./media/libav_utils.cpp \ + ./media/socket_pair.cpp \ + ./media/media_buffer.cpp \ + ./media/media_decoder.cpp \ + ./media/media_encoder.cpp \ + ./media/media_io_handle.cpp \ + ./media/media_codec.cpp \ + ./media/media_attribute.cpp \ + ./media/system_codec_container.cpp \ + ./media/srtp.c \ + ./media/recordable.cpp \ + ./media/media_filter.cpp \ + ./media/media_recorder.cpp \ + ./media/localrecorder.cpp \ + ./media/media_player.cpp \ + ./media/localrecordermanager.cpp \ + ./media/congestion_control.cpp -noinst_HEADERS = \ - rtp_session.h \ - libav_utils.h \ - libav_deps.h \ - socket_pair.h \ - media_buffer.h \ - media_decoder.h \ - media_encoder.h \ - media_io_handle.h \ - media_device.h \ - media_codec.h \ - system_codec_container.h \ - srtp.h \ - recordable.h \ - decoder_finder.h \ - media_filter.h \ - media_stream.h \ - media_recorder.h \ - localrecorder.h \ - media_player.h \ - localrecordermanager.h \ - congestion_control.h +noinst_HEADERS += \ + ./media/rtp_session.h \ + ./media/libav_utils.h \ + ./media/libav_deps.h \ + ./media/socket_pair.h \ + ./media/media_buffer.h \ + ./media/media_decoder.h \ + ./media/media_encoder.h \ + ./media/media_io_handle.h \ + ./media/media_device.h \ + ./media/media_codec.h \ + ./media/system_codec_container.h \ + ./media/srtp.h \ + ./media/recordable.h \ + ./media/decoder_finder.h \ + ./media/media_filter.h \ + ./media/media_stream.h \ + ./media/media_recorder.h \ + ./media/localrecorder.h \ + ./media/media_player.h \ + ./media/localrecordermanager.h \ + ./media/congestion_control.h -libmedia_la_LIBADD = \ - ./audio/libaudio.la +include ./media/audio/Makefile.am +include ./media/video/Makefile.am -if ENABLE_VIDEO -libmedia_la_libADD = \ - ./video/libvideo.la -endif +libring_la_LIBADD += libmedia.la diff --git a/src/media/audio/Makefile.am b/src/media/audio/Makefile.am index fbf6c09c0..2e883492d 100644 --- a/src/media/audio/Makefile.am +++ b/src/media/audio/Makefile.am @@ -1,57 +1,25 @@ -include $(top_srcdir)/globals.mk - -noinst_LTLIBRARIES = libaudio.la - -SUBDIRS = sound echo-cancel - -if BUILD_OPENSL -SUBDIRS += opensl -endif - -if BUILD_ALSA -SUBDIRS += alsa -endif - -if BUILD_PULSE -SUBDIRS += pulseaudio -endif - -if BUILD_JACK -SUBDIRS += jack -endif - -if HAVE_OSX -SUBDIRS += coreaudio -endif - -if HAVE_IOS -SUBDIRS += coreaudio -endif - -if HAVE_PORTAUDIO -SUBDIRS += portaudio -endif +noinst_LTLIBRARIES += libaudio.la +libaudio_la_LIBADD= if BUILD_SPEEXDSP -RING_SPEEXDSP_SRC=dsp.cpp -RING_SPEEXDSP_HEAD=dsp.h +RING_SPEEXDSP_SRC=./media/audio/dsp.cpp +RING_SPEEXDSP_HEAD=./media/audio/dsp.h endif -libaudio_la_SOURCES = \ - audiobuffer.cpp \ - audio_input.cpp \ - audio_frame_resizer.cpp \ - audioloop.cpp \ - ringbuffer.cpp \ - ringbufferpool.cpp \ - audiolayer.cpp \ - resampler.cpp \ - $(RING_SPEEXDSP_SRC) \ - dcblocker.cpp \ - audio_sender.cpp \ - audio_receive_thread.cpp \ - audio_rtp_session.cpp \ - tonecontrol.cpp +libaudio_la_SOURCES = $(RING_SPEEXDSP_SRC) \ + ./media/audio/audiobuffer.cpp \ + ./media/audio/audio_input.cpp \ + ./media/audio/audio_frame_resizer.cpp \ + ./media/audio/audioloop.cpp \ + ./media/audio/ringbuffer.cpp \ + ./media/audio/ringbufferpool.cpp \ + ./media/audio/audiolayer.cpp \ + ./media/audio/resampler.cpp \ + ./media/audio/dcblocker.cpp \ + ./media/audio/audio_sender.cpp \ + ./media/audio/audio_receive_thread.cpp \ + ./media/audio/audio_rtp_session.cpp \ + ./media/audio/tonecontrol.cpp libaudio_la_CXXFLAGS = \ -I$(top_srcdir)/src \ @@ -68,53 +36,51 @@ if HAVE_WEBRTC_AP libaudio_la_CXXFLAGS += @WEBRTC_CFLAGS@ endif -noinst_HEADERS = \ - audiobuffer.h \ - audio_input.h \ - audio_frame_resizer.h \ - audioloop.h \ - ringbuffer.h \ - ringbufferpool.h \ - audiolayer.h \ - resampler.h \ - $(RING_SPEEXDSP_HEAD) \ - dcblocker.h \ - audio_sender.h \ - audio_receive_thread.h \ - audio_rtp_session.h \ - tonecontrol.h +noinst_HEADERS += $(RING_SPEEXDSP_HEAD) \ + ./media/audio/audiobuffer.h \ + ./media/audio/audio_input.h \ + ./media/audio/audio_frame_resizer.h \ + ./media/audio/audioloop.h \ + ./media/audio/ringbuffer.h \ + ./media/audio/ringbufferpool.h \ + ./media/audio/audiolayer.h \ + ./media/audio/resampler.h \ + ./media/audio/dcblocker.h \ + ./media/audio/audio_sender.h \ + ./media/audio/audio_receive_thread.h \ + ./media/audio/audio_rtp_session.h \ + ./media/audio/tonecontrol.h -libaudio_la_LIBADD = \ - ./sound/libsound.la \ - ./echo-cancel/libecho-cancel.la -if BUILD_PULSE -libaudio_la_LIBADD += ./pulseaudio/libpulselayer.la -endif +include ./media/audio/sound/Makefile.am +include ./media/audio/echo-cancel/Makefile.am -if BUILD_JACK -libaudio_la_LIBADD += ./jack/libjacklayer.la -libaudio_la_LDFLAGS += @JACK_LIBS@ -pthread +if BUILD_OPENSL +include ./media/audio/opensl/Makefile.am endif if BUILD_ALSA -libaudio_la_LIBADD += ./alsa/libalsalayer.la +include ./media/audio/alsa/Makefile.am +endif + +if BUILD_PULSE +include ./media/audio/pulseaudio/Makefile.am +endif + +if BUILD_JACK +include ./media/audio/jack/Makefile.am endif if HAVE_OSX -libaudio_la_LIBADD += ./coreaudio/libcoreaudiolayer.la +include ./media/audio/coreaudio/Makefile.am endif if HAVE_IOS -libaudio_la_LIBADD += ./coreaudio/libcoreaudiolayer.la +include ./media/audio/coreaudio/Makefile.am endif -if BUILD_OPENSL -libaudio_la_LIBADD += ./opensl/libopensl.la -libaudio_la_LDFLAGS += -lOpenSLES +if HAVE_PORTAUDIO +include ./media/audio/portaudio/Makefile.am endif -if BUILD_PORTAUDIO -libaudio_la_LIBADD += ./portaudio/libportaudiolayer.la -libaudio_la_LDFLAGS += @PORTAUDIO_LIBS@ -endif +libmedia_la_LIBADD += libaudio.la diff --git a/src/media/audio/alsa/Makefile.am b/src/media/audio/alsa/Makefile.am index 39c9bcdaa..d21616caa 100644 --- a/src/media/audio/alsa/Makefile.am +++ b/src/media/audio/alsa/Makefile.am @@ -1,11 +1,7 @@ -include $(top_srcdir)/globals.mk +noinst_LTLIBRARIES += libalsalayer.la -if BUILD_ALSA +libalsalayer_la_SOURCES = ./media/audio/alsa/alsalayer.cpp -noinst_LTLIBRARIES = libalsalayer.la +noinst_HEADERS += ./media/audio/alsa/alsalayer.h -libalsalayer_la_SOURCES = alsalayer.cpp - -noinst_HEADERS = alsalayer.h - -endif +libaudio_la_LIBADD += libalsalayer.la diff --git a/src/media/audio/coreaudio/Makefile.am b/src/media/audio/coreaudio/Makefile.am index 819c6ccb4..e959e903e 100644 --- a/src/media/audio/coreaudio/Makefile.am +++ b/src/media/audio/coreaudio/Makefile.am @@ -1,16 +1,25 @@ -include $(top_srcdir)/globals.mk +noinst_LTLIBRARIES += libcoreaudiolayer.la + +libcoreaudiolayer_la_SOURCES= if HAVE_OSX -noinst_LTLIBRARIES = libcoreaudiolayer.la -libcoreaudiolayer_la_SOURCES = osx/corelayer.mm osx/corelayer.h osx/audiodevice.cpp osx/audiodevice.h +libcoreaudiolayer_la_SOURCES += \ + ./media/audio/coreaudio/osx/corelayer.mm \ + ./media/audio/coreaudio/osx/corelayer.h \ + ./media/audio/coreaudio/osx/audiodevice.cpp \ + ./media/audio/coreaudio/osx/audiodevice.h endif if HAVE_IOS -noinst_LTLIBRARIES = libcoreaudiolayer.la -libcoreaudiolayer_la_SOURCES = ios/corelayer.mm ios/corelayer.h +libcoreaudiolayer_la_SOURCES += \ + ./media/audio/coreaudio/ios/corelayer.mm \ + ./media/audio/coreaudio/ios/corelayer.h endif libcoreaudiolayer_la_CXXFLAGS = \ -I$(top_srcdir)/src \ $(AM_CXXFLAGS) -AM_OBJCXXFLAGS = -std=c++17 + +libcoreaudiolayer_la_OBJCXXFLAGS = -std=c++17 + +libaudio_la_LIBADD += libcoreaudiolayer.la diff --git a/src/media/audio/echo-cancel/Makefile.am b/src/media/audio/echo-cancel/Makefile.am index 0607d5294..197d4c769 100644 --- a/src/media/audio/echo-cancel/Makefile.am +++ b/src/media/audio/echo-cancel/Makefile.am @@ -1,24 +1,24 @@ -include $(top_srcdir)/globals.mk +noinst_LTLIBRARIES += libecho-cancel.la -noinst_LTLIBRARIES = libecho-cancel.la - -EC_SRC = null_echo_canceller.cpp -EC_HDR = null_echo_canceller.h +EC_SRC = ./media/audio/echo-cancel/null_echo_canceller.cpp +EC_HDR = ./media/audio/echo-cancel/null_echo_canceller.h if BUILD_SPEEXDSP -EC_SRC += speex_echo_canceller.cpp -EC_HDR += speex_echo_canceller.h +EC_SRC += ./media/audio/echo-cancel/speex_echo_canceller.cpp +EC_HDR += ./media/audio/echo-cancel/speex_echo_canceller.h endif if HAVE_WEBRTC_AP -EC_SRC += webrtc_echo_canceller.cpp -EC_HDR += webrtc_echo_canceller.h +EC_SRC += ./media/audio/echo-cancel/webrtc_echo_canceller.cpp +EC_HDR += ./media/audio/echo-cancel/webrtc_echo_canceller.h libecho_cancel_la_CXXFLAGS = @WEBRTC_CFLAGS@ $(AM_CXXFLAGS) endif libecho_cancel_la_SOURCES = \ $(EC_SRC) -noinst_HEADERS = \ - echo_canceller.h \ +noinst_HEADERS += \ + ./media/audio/echo-cancel/echo_canceller.h \ $(EC_HDR) + +libaudio_la_LIBADD += libecho-cancel.la diff --git a/src/media/audio/jack/Makefile.am b/src/media/audio/jack/Makefile.am index 846dda948..a1e94abe6 100644 --- a/src/media/audio/jack/Makefile.am +++ b/src/media/audio/jack/Makefile.am @@ -1,6 +1,8 @@ -include $(top_srcdir)/globals.mk +noinst_LTLIBRARIES += libjacklayer.la -if BUILD_JACK -noinst_LTLIBRARIES = libjacklayer.la -libjacklayer_la_SOURCES = jacklayer.cpp jacklayer.h -endif +libjacklayer_la_SOURCES = \ + ./media/audio/jack/jacklayer.cpp \ + ./media/audio/jack/jacklayer.h + +libaudio_la_LDFLAGS += @JACK_LIBS@ -pthread +libaudio_la_LIBADD += libjacklayer.la diff --git a/src/media/audio/opensl/Makefile.am b/src/media/audio/opensl/Makefile.am index b5c3ec0cf..f44cd196a 100644 --- a/src/media/audio/opensl/Makefile.am +++ b/src/media/audio/opensl/Makefile.am @@ -1,11 +1,17 @@ -include $(top_srcdir)/globals.mk +noinst_LTLIBRARIES += libopensl.la -if BUILD_OPENSL +libopensl_la_SOURCES = \ + ./media/audio/opensl/opensllayer.cpp \ + ./media/audio/opensl/audio_player.cpp \ + ./media/audio/opensl/audio_recorder.cpp -noinst_LTLIBRARIES = libopensl.la +noinst_HEADERS += \ + ./media/audio/opensl/opensllayer.h \ + ./media/audio/opensl/audio_common.h \ + ./media/audio/opensl/audio_player.h \ + ./media/audio/opensl/audio_recorder.h \ + ./media/audio/opensl/buf_manager.h -libopensl_la_SOURCES = opensllayer.cpp audio_player.cpp audio_recorder.cpp -noinst_HEADERS = opensllayer.h audio_common.h audio_player.h audio_recorder.h buf_manager.h - -endif +libaudio_la_LDFLAGS += -lOpenSLES +libaudio_la_LIBADD += libopensl.la diff --git a/src/media/audio/portaudio/Makefile.am b/src/media/audio/portaudio/Makefile.am index 4313987ed..2605d18ae 100644 --- a/src/media/audio/portaudio/Makefile.am +++ b/src/media/audio/portaudio/Makefile.am @@ -1,14 +1,11 @@ -include $(top_srcdir)/globals.mk - -if BUILD_PORTAUDIO - -noinst_LTLIBRARIES = libportaudiolayer.la +noinst_LTLIBRARIES += libportaudiolayer.la libportaudiolayer_la_SOURCES = \ - portaudiolayer.cpp + ./media/audio/portaudio/portaudiolayer.cpp -noinst_HEADERS = \ - portaudiolayer.h +noinst_HEADERS += \ + ./media/audio/portaudio/portaudiolayer.h -endif +libaudio_la_LDFLAGS += @PORTAUDIO_LIBS@ +libaudio_la_LIBADD += libportaudiolayer.la diff --git a/src/media/audio/pulseaudio/Makefile.am b/src/media/audio/pulseaudio/Makefile.am index faa11ff40..bb2ec41d7 100644 --- a/src/media/audio/pulseaudio/Makefile.am +++ b/src/media/audio/pulseaudio/Makefile.am @@ -1,16 +1,12 @@ -include $(top_srcdir)/globals.mk - -if BUILD_PULSE - -noinst_LTLIBRARIES = libpulselayer.la +noinst_LTLIBRARIES += libpulselayer.la libpulselayer_la_SOURCES = \ - audiostream.cpp \ - pulselayer.cpp + ./media/audio/pulseaudio/audiostream.cpp \ + ./media/audio/pulseaudio/pulselayer.cpp -noinst_HEADERS = \ - audiostream.h \ - pulselayer.h +noinst_HEADERS += \ + ./media/audio/pulseaudio/audiostream.h \ + ./media/audio/pulseaudio/pulselayer.h -endif +libaudio_la_LIBADD += libpulselayer.la diff --git a/src/media/audio/sound/Makefile.am b/src/media/audio/sound/Makefile.am index 5997ce268..14e7bd373 100644 --- a/src/media/audio/sound/Makefile.am +++ b/src/media/audio/sound/Makefile.am @@ -1,17 +1,17 @@ -include $(top_srcdir)/globals.mk - -noinst_LTLIBRARIES = libsound.la +noinst_LTLIBRARIES += libsound.la libsound_la_SOURCES = \ - audiofile.cpp \ - tone.cpp \ - tonelist.cpp \ - dtmf.cpp \ - dtmfgenerator.cpp + ./media/audio/sound/audiofile.cpp \ + ./media/audio/sound/tone.cpp \ + ./media/audio/sound/tonelist.cpp \ + ./media/audio/sound/dtmf.cpp \ + ./media/audio/sound/dtmfgenerator.cpp -noinst_HEADERS = \ - audiofile.h \ - tone.h \ - tonelist.h \ - dtmfgenerator.h \ - dtmf.h +noinst_HEADERS += \ + ./media/audio/sound/audiofile.h \ + ./media/audio/sound/tone.h \ + ./media/audio/sound/tonelist.h \ + ./media/audio/sound/dtmfgenerator.h \ + ./media/audio/sound/dtmf.h + +libaudio_la_LIBADD += libsound.la diff --git a/src/media/video/Makefile.am b/src/media/video/Makefile.am index c820609e2..2f5619a47 100644 --- a/src/media/video/Makefile.am +++ b/src/media/video/Makefile.am @@ -1,49 +1,27 @@ -include $(top_srcdir)/globals.mk +if ENABLE_VIDEO -if HAVE_LINUX -if HAVE_ANDROID -SUBDIRS= \ - androidvideo -else -SUBDIRS= \ - v4l2 -endif -endif +noinst_LTLIBRARIES += libvideo.la -if HAVE_OSX -SUBDIRS= \ - osxvideo -endif +libvideo_la_LIBADD= -if HAVE_IOS -SUBDIRS= \ - iosvideo -endif - -if HAVE_WIN32 -SUBDIRS= \ - winvideo -endif - -noinst_LTLIBRARIES = libvideo.la libvideo_la_SOURCES = \ - video_device.h \ - video_device_monitor.cpp video_device_monitor.h \ - video_base.cpp video_base.h \ - video_scaler.cpp video_scaler.h \ - video_mixer.cpp video_mixer.h \ - video_input.cpp video_input.h \ - video_receive_thread.cpp video_receive_thread.h \ - video_sender.cpp video_sender.h \ - video_rtp_session.cpp video_rtp_session.h \ - sinkclient.cpp sinkclient.h \ - filter_transpose.cpp filter_transpose.h + ./media/video/video_device.h \ + ./media/video/video_device_monitor.cpp video_device_monitor.h \ + ./media/video/video_base.cpp video_base.h \ + ./media/video/video_scaler.cpp video_scaler.h \ + ./media/video/video_mixer.cpp video_mixer.h \ + ./media/video/video_input.cpp video_input.h \ + ./media/video/video_receive_thread.cpp video_receive_thread.h \ + ./media/video/video_sender.cpp video_sender.h \ + ./media/video/video_rtp_session.cpp video_rtp_session.h \ + ./media/video/sinkclient.cpp sinkclient.h \ + ./media/video/filter_transpose.cpp filter_transpose.h if RING_ACCEL -libvideo_la_SOURCES += accel.cpp accel.h +libvideo_la_SOURCES += ./media/video/accel.cpp ./media/video/accel.h endif -libvideo_la_LIBADD = \ +libvideo_la_LIBADD += \ @LIBAVCODEC_LIBS@ \ @LIBAVFORMAT_LIBS@ \ @LIBAVDEVICE_LIBS@ \ @@ -65,6 +43,31 @@ libvideo_la_CXXFLAGS = \ $(AM_CXXFLAGS) if HAVE_WIN32 - libvideo_la_CXXFLAGS += -static - libvideo_la_CFLAGS += -static +libvideo_la_CXXFLAGS += -static +libvideo_la_CFLAGS += -static endif + + +if HAVE_LINUX +if HAVE_ANDROID +include ./media/video/androidvideo/Makefile.am +else +include ./media/video/v4l2/Makefile.am +endif +endif + +if HAVE_OSX +include ./media/video/osxvideo/Makefile.am +endif + +if HAVE_IOS +include ./media/video/iosvideo/Makefile.am +endif + +if HAVE_WIN32 +include ./media/video/winvideo/Makefile.am +endif + +libmedia_la_LIBADD += libvideo.la + +endif # ENABLE_VIDEO diff --git a/src/media/video/androidvideo/Makefile.am b/src/media/video/androidvideo/Makefile.am index f651fc05d..94d320f4c 100644 --- a/src/media/video/androidvideo/Makefile.am +++ b/src/media/video/androidvideo/Makefile.am @@ -1,10 +1,10 @@ -include $(top_srcdir)/globals.mk - -noinst_LTLIBRARIES = libandroidvideo.la +noinst_LTLIBRARIES += libandroidvideo.la libandroidvideo_la_SOURCES = \ - video_device_impl.cpp \ - video_device_monitor_impl.cpp + ./media/video/androidvideo/video_device_impl.cpp \ + ./media/video/androidvideo/video_device_monitor_impl.cpp #AM_CXXFLAGS = @UDEV_CFLAGS@ #libandroidvideo_la_LIBADD = @UDEV_LIBS@ + +libvideo_la_LIBADD += libandroidvideo.la diff --git a/src/media/video/iosvideo/Makefile.am b/src/media/video/iosvideo/Makefile.am index 574cb8d2d..0ae0a4dba 100644 --- a/src/media/video/iosvideo/Makefile.am +++ b/src/media/video/iosvideo/Makefile.am @@ -1,10 +1,10 @@ -include $(top_srcdir)/globals.mk - -noinst_LTLIBRARIES = libiosvideo.la +noinst_LTLIBRARIES += libiosvideo.la libiosvideo_la_SOURCES = \ - video_device_impl.cpp \ - video_device_monitor_impl.cpp + ./media/video/iosvideo/video_device_impl.cpp \ + ./media/video/iosvideo/video_device_monitor_impl.cpp + +libvideo_la_LIBADD += libiosvideo.la #AM_CXXFLAGS = @UDEV_CFLAGS@ #libiosvideo_la_LIBADD = @UDEV_LIBS@ diff --git a/src/media/video/osxvideo/Makefile.am b/src/media/video/osxvideo/Makefile.am index 8a2e10f54..fa520a0a6 100644 --- a/src/media/video/osxvideo/Makefile.am +++ b/src/media/video/osxvideo/Makefile.am @@ -1,9 +1,9 @@ -include $(top_srcdir)/globals.mk - -noinst_LTLIBRARIES = libosxvideo.la +noinst_LTLIBRARIES += libosxvideo.la libosxvideo_la_SOURCES = \ - video_device_impl.mm \ - video_device_monitor_impl.mm + ./media/video/osxvideo/video_device_impl.mm \ + ./media/video/osxvideo/video_device_monitor_impl.mm -AM_OBJCXXFLAGS = -std=c++17 +libosxvideo_la_AM_OBJCXXFLAGS = -std=c++17 + +libvideo_la_LIBADD += libosxvideo.la diff --git a/src/media/video/v4l2/Makefile.am b/src/media/video/v4l2/Makefile.am index 5cdf30224..9caf8aeee 100644 --- a/src/media/video/v4l2/Makefile.am +++ b/src/media/video/v4l2/Makefile.am @@ -1,12 +1,10 @@ -include $(top_srcdir)/globals.mk - -noinst_LTLIBRARIES = libv4l2.la +noinst_LTLIBRARIES += libv4l2.la libv4l2_la_SOURCES = \ - video_device_impl.cpp \ - video_device_monitor_impl.cpp + ./media/video/v4l2/video_device_impl.cpp \ + ./media/video/v4l2/video_device_monitor_impl.cpp -AM_CXXFLAGS += \ +libv4l2_la_AM_CXXFLAGS = \ @LIBAVCODEC_CFLAGS@ \ @LIBAVFORMAT_CFLAGS@ \ @LIBAVDEVICE_CFLAGS@ \ @@ -21,3 +19,5 @@ libv4l2_la_LIBADD = \ @LIBSWSCALE_LIBS@ \ @LIBAVUTIL_LIBS@ \ @UDEV_LIBS@ + +libvideo_la_LIBADD += libv4l2.la diff --git a/src/media/video/winvideo/Makefile.am b/src/media/video/winvideo/Makefile.am index 3451b694c..92c155a30 100644 --- a/src/media/video/winvideo/Makefile.am +++ b/src/media/video/winvideo/Makefile.am @@ -1,11 +1,11 @@ -include $(top_srcdir)/globals.mk - -noinst_LTLIBRARIES = libwinvideo.la +noinst_LTLIBRARIES += libwinvideo.la libwinvideo_la_SOURCES = \ - video_device_impl.cpp \ - video_device_monitor_impl.cpp + ./media/video/winvideo/video_device_impl.cpp \ + ./media/video/winvideo/video_device_monitor_impl.cpp -AM_OBJCXXFLAGS = -std=c++11 +libwinvideo_la_AM_OBJCXXFLAGS = -std=c++11 -libwinvideo_la_LIBADD = -ldxguid -lole32 -luuid -lstrmiids -loleaut32 -lgdi32 \ No newline at end of file +libwinvideo_la_LIBADD = -ldxguid -lole32 -luuid -lstrmiids -loleaut32 -lgdi32 + +libvideo_la_LIBADD += libwinvideo.la diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am index ed21d07f4..4ce81f757 100644 --- a/src/plugin/Makefile.am +++ b/src/plugin/Makefile.am @@ -1,25 +1,29 @@ -include $(top_srcdir)/globals.mk +if ENABLE_PLUGIN -noinst_LTLIBRARIES = libplugin.la +noinst_LTLIBRARIES += libplugin.la -noinst_HEADERS = \ - callservicesmanager.h \ - chathandler.h \ - chatservicesmanager.h \ - jamiplugin.h \ - jamipluginmanager.h \ - mediahandler.h \ - pluginloader.h \ - pluginmanager.h \ - pluginpreferencesutils.h \ - streamdata.h \ - pluginsutils.h +noinst_HEADERS += \ + ./plugin/callservicesmanager.h \ + ./plugin/chathandler.h \ + ./plugin/chatservicesmanager.h \ + ./plugin/jamiplugin.h \ + ./plugin/jamipluginmanager.h \ + ./plugin/mediahandler.h \ + ./plugin/pluginloader.h \ + ./plugin/pluginmanager.h \ + ./plugin/pluginpreferencesutils.h \ + ./plugin/streamdata.h \ + ./plugin/pluginsutils.h libplugin_la_SOURCES = \ - jamipluginmanager.cpp \ - pluginloader.cpp \ - pluginmanager.cpp \ - pluginpreferencesutils.cpp \ - pluginsutils.cpp \ - chatservicesmanager.cpp \ - callservicesmanager.cpp + ./plugin/jamipluginmanager.cpp \ + ./plugin/pluginloader.cpp \ + ./plugin/pluginmanager.cpp \ + ./plugin/pluginpreferencesutils.cpp \ + ./plugin/pluginsutils.cpp \ + ./plugin/chatservicesmanager.cpp \ + ./plugin/callservicesmanager.cpp + +libring_la_LIBADD += libplugin.la + +endif diff --git a/src/security/Makefile.am b/src/security/Makefile.am index 5d168d9a6..b881265d4 100644 --- a/src/security/Makefile.am +++ b/src/security/Makefile.am @@ -1,16 +1,17 @@ -include $(top_srcdir)/globals.mk +noinst_LTLIBRARIES += libsecurity.la -noinst_LTLIBRARIES = libsecurity.la libsecurity_la_CXXFLAGS = -I$(top_srcdir)/src $(AM_CXXFLAGS) libsecurity_la_SOURCES = \ - tls_session.cpp \ - tls_session.h \ - tlsvalidator.cpp \ - tlsvalidator.h \ - certstore.cpp \ - certstore.h \ - memory.cpp \ - memory.h \ - diffie-hellman.cpp \ - diffie-hellman.h + ./security/tls_session.cpp \ + ./security/tls_session.h \ + ./security/tlsvalidator.cpp \ + ./security/tlsvalidator.h \ + ./security/certstore.cpp \ + ./security/certstore.h \ + ./security/memory.cpp \ + ./security/memory.h \ + ./security/diffie-hellman.cpp \ + ./security/diffie-hellman.h + +libring_la_LIBADD += libsecurity.la diff --git a/src/sip/Makefile.am b/src/sip/Makefile.am index a919581ab..2a09a1d86 100644 --- a/src/sip/Makefile.am +++ b/src/sip/Makefile.am @@ -1,30 +1,29 @@ -include $(top_srcdir)/globals.mk +noinst_LTLIBRARIES += libsiplink.la -noinst_LTLIBRARIES = libsiplink.la libsiplink_la_CXXFLAGS = -I$(top_srcdir)/src $(AM_CXXFLAGS) libsiplink_la_SOURCES = \ - sipaccountbase.cpp \ - sdp.cpp \ - sipaccount.cpp \ - sipcall.cpp \ - sipvoiplink.cpp \ - siptransport.cpp \ - sipaccountbase.h \ - sdp.h \ - sipaccount.h \ - sipcall.h \ - sipvoiplink.h \ - siptransport.h \ - sip_utils.cpp \ - sip_utils.h + ./sip/sipaccountbase.cpp \ + ./sip/sdp.cpp \ + ./sip/sipaccount.cpp \ + ./sip/sipcall.cpp \ + ./sip/sipvoiplink.cpp \ + ./sip/siptransport.cpp \ + ./sip/sipaccountbase.h \ + ./sip/sdp.h \ + ./sip/sipaccount.h \ + ./sip/sipcall.h \ + ./sip/sipvoiplink.h \ + ./sip/siptransport.h \ + ./sip/sip_utils.cpp \ + ./sip/sip_utils.h \ + ./sip/sippresence.cpp \ + ./sip/sippresence.h \ + ./sip/pres_sub_server.cpp\ + ./sip/pres_sub_server.h\ + ./sip/pres_sub_client.cpp\ + ./sip/pres_sub_client.h \ + ./sip/sdes_negotiator.cpp \ + ./sip/sdes_negotiator.h -libsiplink_la_SOURCES+=sippresence.cpp \ - sippresence.h \ - pres_sub_server.cpp\ - pres_sub_server.h\ - pres_sub_client.cpp\ - pres_sub_client.h - -libsiplink_la_SOURCES+= sdes_negotiator.cpp \ - sdes_negotiator.h +libring_la_LIBADD += libsiplink.la diff --git a/src/upnp/Makefile.am b/src/upnp/Makefile.am index 0bf4ca8b1..51bec6700 100644 --- a/src/upnp/Makefile.am +++ b/src/upnp/Makefile.am @@ -1,14 +1,13 @@ -include $(top_srcdir)/globals.mk +noinst_LTLIBRARIES += libupnpcontrol.la -noinst_LTLIBRARIES = libupnpcontrol.la - -SUBDIRS = protocol +libupnpcontrol_la_LIBADD= libupnpcontrol_la_SOURCES = \ - upnp_control.cpp \ - upnp_control.h \ - upnp_context.cpp \ - upnp_context.h + ./upnp/upnp_control.cpp \ + ./upnp/upnp_control.h \ + ./upnp/upnp_context.cpp \ + ./upnp/upnp_context.h -libupnpcontrol_la_LIBADD = \ - ./protocol/libupnpprotocol.la +include ./upnp/protocol/Makefile.am + +libring_la_LIBADD += libupnpcontrol.la diff --git a/src/upnp/protocol/Makefile.am b/src/upnp/protocol/Makefile.am index f48ba5fcc..5db50e198 100644 --- a/src/upnp/protocol/Makefile.am +++ b/src/upnp/protocol/Makefile.am @@ -1,30 +1,21 @@ -include $(top_srcdir)/globals.mk - -noinst_LTLIBRARIES = libupnpprotocol.la - -SUBDIRS = - -if BUILD_PUPNP -SUBDIRS += pupnp -endif -if BUILD_NATPMP -SUBDIRS += natpmp -endif +noinst_LTLIBRARIES += libupnpprotocol.la libupnpprotocol_la_SOURCES = \ - igd.h \ - igd.cpp \ - mapping.h \ - mapping.cpp \ - global_mapping.h \ - upnp_protocol.h + ./upnp/protocol/igd.h \ + ./upnp/protocol/igd.cpp \ + ./upnp/protocol/mapping.h \ + ./upnp/protocol/mapping.cpp \ + ./upnp/protocol/global_mapping.h \ + ./upnp/protocol/upnp_protocol.h -libupnpprotocol_la_LIBADD = +libupnpprotocol_la_LIBADD = if BUILD_PUPNP -libupnpprotocol_la_LIBADD += ./pupnp/libpupnp.la +include ./upnp/protocol/pupnp/Makefile.am endif if BUILD_NATPMP -libupnpprotocol_la_LIBADD += ./natpmp/libnat_pmp.la +include ./upnp/protocol/natpmp/Makefile.am endif + +libupnpcontrol_la_LIBADD += libupnpprotocol.la diff --git a/src/upnp/protocol/natpmp/Makefile.am b/src/upnp/protocol/natpmp/Makefile.am index 4c3d63256..8b0309f78 100644 --- a/src/upnp/protocol/natpmp/Makefile.am +++ b/src/upnp/protocol/natpmp/Makefile.am @@ -1,9 +1,9 @@ -include $(top_srcdir)/globals.mk - -noinst_LTLIBRARIES = libnat_pmp.la +noinst_LTLIBRARIES += libnat_pmp.la libnat_pmp_la_SOURCES = \ - pmp_igd.h \ - pmp_igd.cpp \ - nat_pmp.h \ - nat_pmp.cpp + ./upnp/protocol/natpmp/pmp_igd.h \ + ./upnp/protocol/natpmp/pmp_igd.cpp \ + ./upnp/protocol/natpmp/nat_pmp.h \ + ./upnp/protocol/natpmp/nat_pmp.cpp + +libupnpprotocol_la_LIBADD += libnat_pmp.la diff --git a/src/upnp/protocol/pupnp/Makefile.am b/src/upnp/protocol/pupnp/Makefile.am index bb837714d..18a3f6515 100644 --- a/src/upnp/protocol/pupnp/Makefile.am +++ b/src/upnp/protocol/pupnp/Makefile.am @@ -1,9 +1,9 @@ -include $(top_srcdir)/globals.mk - -noinst_LTLIBRARIES = libpupnp.la +noinst_LTLIBRARIES += libpupnp.la libpupnp_la_SOURCES = \ - upnp_igd.h \ - upnp_igd.cpp \ - pupnp.h \ - pupnp.cpp + ./upnp/protocol/pupnp/upnp_igd.h \ + ./upnp/protocol/pupnp/upnp_igd.cpp \ + ./upnp/protocol/pupnp/pupnp.h \ + ./upnp/protocol/pupnp/pupnp.cpp + +libupnpprotocol_la_LIBADD += libpupnp.la