-
- Downloads
configure.ac: Do not set user variables.
The CFLAGS, CXXFLAGS, LDFLAGS and other variables intended to be overridden by the user should not directly be set by the package. This change uses one of the approaches recommended by the Autoconf and Automake manuals, which is to use custom variables to accumulate flags in the configure script and add them to the make targets they apply to. This has the benefit of not cluttering the flags used during the Autoconf tests, which has proved problematic (see the previous commit for a demonstration). * configure.ac: Replace CFLAGS, CXXFLAGS, CPPFLAGS and LDFLAGS by DAEMONCFLAGS, DAEMONCXXFLAGS, DAEMONCPPFLAGS and DAEMONLDFLAGS, respectively. Use these custom variables as the default values of AM_CFLAGS, AM_CXXFLAGS, AM_CPPFLAGS and AM_LDFLAGS, respectively. Remove an extraneous check on jsoncpp. * bin/Makefile.am (ringcli_CXXFLAGS): Honor the the AM_CXXFLAGS variable. globals.mk: Extend rather than override the AM_CPPFLAGS variable. * src/Makefile.am (libring_la_LDFLAGS): Honor AM_LDFLAGS. (libring_la_CFLAGS): Honor AM_CFLAGS. (libring_la_CXXFLAGS): Honor AM_CXXFLAGS. * src/client/Makefile.am (libclient_la_CXXFLAGS): Honor AM_CXXFLAGS. * src/im/Makefile.am (libim_la_CXXFLAGS): Remove variable. * src/jamidht/Makefile.am (libringacc_la_CXXFLAGS): Likewise. * src/media/audio/Makefile.am (libaudio_la_CXXFLAGS): Honor AM_CXXFLAGS. (libaudio_la_LDFLAGS): Honor the AM_CXXFLAGS variable. * src/media/audio/coreaudio/Makefile.am (libcoreaudiolayer_la_CXXFLAGS): Likewise. * src/media/video/Makefile.am (libvideo_la_CFLAGS): Honor the AM_CFLAGS variable. (libvideo_la_CXXFLAGS): Honor the AM_CXXFLAGS variable. * src/media/video/v4l2/Makefile.am (AM_CXXFLAGS): Extend rather than override. * src/plugin/Makefile.am (libplugin_la_CXXFLAGS): Honor the AM_CXXFLAGS variable. * src/security/Makefile.am (libsecurity_la_CXXFLAGS): Likewise. * src/sip/Makefile.am (libsiplink_la_CXXFLAGS): Likewise. * src/upnp/Makefile.am (libupnpcontrol_la_CXXFLAGS): Remove variable. * src/upnp/protocol/Makefile.am (libupnpprotocol_la_CXXFLAGS): Likewise. * src/upnp/protocol/natpmp/Makefile.am (libnat_pmp_la_CXXFLAGS): Likewise. * src/upnp/protocol/pupnp/Makefile.am (libpupnp_la_CXXFLAGS): Likewise. * test/sip/Makefile.am (AM_CXXFLAGS, AM_LDFLAGS): Extend rather than override. * test/unitTest/Makefile.am (AM_CXXFLAGS, AM_LDFLAGS): Likewise. GitLab: #487 Change-Id: I18be9d812159f8156efb9f7849e7eac6d4c6b3ca squash! configure.ac: Do not set user variables. Change-Id: I1146ea15d6fb75fe53d3cbdd782e981c933e82a6
Showing
- bin/Makefile.am 4 additions, 2 deletionsbin/Makefile.am
- configure.ac 87 additions, 98 deletionsconfigure.ac
- globals.mk 1 addition, 1 deletionglobals.mk
- src/Makefile.am 5 additions, 3 deletionssrc/Makefile.am
- src/client/Makefile.am 2 additions, 1 deletionsrc/client/Makefile.am
- src/im/Makefile.am 0 additions, 1 deletionsrc/im/Makefile.am
- src/jamidht/Makefile.am 0 additions, 2 deletionssrc/jamidht/Makefile.am
- src/media/audio/Makefile.am 5 additions, 2 deletionssrc/media/audio/Makefile.am
- src/media/audio/coreaudio/Makefile.am 3 additions, 1 deletionsrc/media/audio/coreaudio/Makefile.am
- src/media/video/Makefile.am 21 additions, 5 deletionssrc/media/video/Makefile.am
- src/media/video/v4l2/Makefile.am 14 additions, 4 deletionssrc/media/video/v4l2/Makefile.am
- src/plugin/Makefile.am 2 additions, 1 deletionsrc/plugin/Makefile.am
- src/security/Makefile.am 1 addition, 1 deletionsrc/security/Makefile.am
- src/sip/Makefile.am 1 addition, 1 deletionsrc/sip/Makefile.am
- src/upnp/Makefile.am 1 addition, 4 deletionssrc/upnp/Makefile.am
- src/upnp/protocol/Makefile.am 1 addition, 4 deletionssrc/upnp/protocol/Makefile.am
- src/upnp/protocol/natpmp/Makefile.am 1 addition, 4 deletionssrc/upnp/protocol/natpmp/Makefile.am
- src/upnp/protocol/pupnp/Makefile.am 1 addition, 4 deletionssrc/upnp/protocol/pupnp/Makefile.am
- test/sip/Makefile.am 2 additions, 2 deletionstest/sip/Makefile.am
- test/unitTest/Makefile.am 3 additions, 3 deletionstest/unitTest/Makefile.am
Loading