diff options
| author | Igor V. Kovalenko <igor.v.kovalenko@gmail.com> | 2021-01-18 18:38:19 +0300 |
|---|---|---|
| committer | PulseAudio Marge Bot <pulseaudio-maintainers@lists.freedesktop.org> | 2021-01-18 17:57:41 +0000 |
| commit | 4f0f215a13ebf7618bfc25b0349b457359407034 (patch) | |
| tree | 79016eebc335eecc6ff871e1caf8016282b83536 | |
| parent | 6d41b93cdb011a08d01770624a8fe5bb9720b586 (diff) | |
buildsys: autotools: move map-file to src/pulse
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/461>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/pulse/map-file (renamed from src/map-file) | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 155e5653e..e454cbbf7 100644 --- a/configure.ac +++ b/configure.ac @@ -195,8 +195,8 @@ AS_CASE([" $CFLAGS "], [*" -O0 "*], [], [ # Check whether the linker supports the -version-script option. # The Make variable $(srcdir) needs to be in the LDFLAGS in that form, # so that it is expanded the right way in every subdir. -AX_CHECK_LINK_FLAG(["-Wl,-version-script=${srcdir}/src/map-file"], - [VERSIONING_LDFLAGS='-Wl,-version-script=$(abs_top_srcdir)/src/map-file']) +AX_CHECK_LINK_FLAG(["-Wl,-version-script=${srcdir}/src/pulse/map-file"], + [VERSIONING_LDFLAGS='-Wl,-version-script=$(abs_top_srcdir)/src/pulse/map-file']) AC_SUBST([VERSIONING_LDFLAGS]) # Use immediate (now) bindings; avoids the funky re-call in itself. diff --git a/src/Makefile.am b/src/Makefile.am index f45821dda..7d06bfc58 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -107,7 +107,7 @@ EXTRA_DIST = \ utils/qpaeq \ utils/pa-info \ daemon/pulseaudio.desktop.in \ - map-file \ + pulse/map-file \ daemon/pulseaudio-system.conf \ modules/echo-cancel/adrian-license.txt \ modules/gsettings/org.freedesktop.pulseaudio.gschema.xml \ @@ -2277,7 +2277,7 @@ update-map-file: ctags -I PA_GCC_MALLOC,PA_GCC_ALLOC_SIZE2,PA_GCC_ALLOC_SIZE,PA_GCC_PURE,PA_GCC_CONST,PA_GCC_DEPRECATED,PA_GCC_PRINTF_ATTR -f - --c-kinds=p $(pulseinclude_HEADERS) | awk '/^pa_/ { print $$1 ";" }' | sort ; \ echo "local:" ; \ echo "*;" ; \ - echo "};" ) > $(srcdir)/map-file + echo "};" ) > $(srcdir)/pulse/map-file update-all: update-ffmpeg update-map-file diff --git a/src/map-file b/src/pulse/map-file index 7b1ed5206..7b1ed5206 100644 --- a/src/map-file +++ b/src/pulse/map-file |