[PATCH libinputmapper 03/13] Move .pc and .sym file into src directory
David Herrmann
dh.herrmann at gmail.com
Sun Sep 1 08:51:00 PDT 2013
Hi
On Wed, Aug 28, 2013 at 3:00 AM, Peter Hutterer
<peter.hutterer at who-t.net> wrote:
> This isn't documentation
"doc" is "documentation", "docs" I use for "documents",.. but yeah,
not really obvious so I merged the patch.
Thanks
David
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
> .gitignore | 2 +-
> Makefile.am | 10 +++++-----
> configure.ac | 2 +-
> docs/libinputmapper.pc.in | 11 -----------
> docs/libinputmapper.sym | 46 ----------------------------------------------
> src/libinputmapper.pc.in | 11 +++++++++++
> src/libinputmapper.sym | 46 ++++++++++++++++++++++++++++++++++++++++++++++
> 7 files changed, 64 insertions(+), 64 deletions(-)
> delete mode 100644 docs/libinputmapper.pc.in
> delete mode 100644 docs/libinputmapper.sym
> create mode 100644 src/libinputmapper.pc.in
> create mode 100644 src/libinputmapper.sym
>
> diff --git a/.gitignore b/.gitignore
> index 5886ae0..063efd2 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -15,7 +15,7 @@ config.h.in
> config.log
> config.status
> configure
> -docs/libinputmapper.pc
> +src/libinputmapper.pc
> libtool
> m4/
> stamp-h1
> diff --git a/Makefile.am b/Makefile.am
> index a0eb39d..9712040 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -29,8 +29,8 @@ EXTRA_DIST = \
> README \
> COPYING \
> NEWS \
> - docs/libinputmapper.pc.in \
> - docs/libinputmapper.sym
> + src/libinputmapper.pc.in \
> + src/libinputmapper.sym
> CLEANFILES =
> pkgconfigdir = $(libdir)/pkgconfig
> pkgconfig_DATA =
> @@ -75,7 +75,7 @@ AM_LDFLAGS = \
>
> lib_LTLIBRARIES += libinputmapper.la
> include_HEADERS += src/libinputmapper.h
> -pkgconfig_DATA += docs/libinputmapper.pc
> +pkgconfig_DATA += src/libinputmapper.pc
>
> libinputmapper_la_SOURCES = \
> src/libinputmapper.h \
> @@ -88,11 +88,11 @@ libinputmapper_la_CPPFLAGS = \
> $(UDEV_CFLAGS) \
> $(LIBUDEV_CFLAGS)
> libinputmapper_la_LIBADD = $(UDEV_LIBS) $(LIBUDEV_LIBS)
> -EXTRA_libinputmapper_la_DEPENDENCIES = $(top_srcdir)/docs/libinputmapper.sym
> +EXTRA_libinputmapper_la_DEPENDENCIES = $(top_srcdir)/src/libinputmapper.sym
> libinputmapper_la_LDFLAGS = \
> $(AM_LDFLAGS) \
> -version-info $(LIBINPUTMAPPER_CURRENT):$(LIBINPUTMAPPER_REVISION):$(LIBINPUTMAPPER_AGE) \
> - -Wl,--version-script="$(top_srcdir)/docs/libinputmapper.sym"
> + -Wl,--version-script="$(top_srcdir)/src/libinputmapper.sym"
>
> #
> # Phony targets
> diff --git a/configure.ac b/configure.ac
> index 37bc96b..8f4484f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -49,7 +49,7 @@ PKG_CHECK_MODULES([UDEV], [udev >= 172])
> #
>
> AC_CONFIG_FILES([Makefile
> - docs/libinputmapper.pc])
> + src/libinputmapper.pc])
> AC_OUTPUT
>
> #
> diff --git a/docs/libinputmapper.pc.in b/docs/libinputmapper.pc.in
> deleted file mode 100644
> index 8677ee1..0000000
> --- a/docs/libinputmapper.pc.in
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -prefix=@prefix@
> -exec_prefix=@exec_prefix@
> -libdir=@libdir@
> -includedir=@includedir@
> -
> -Name: libinputmapper
> -Description: Input event-mapping library
> -URL: @PACKAGE_URL@
> -Version: @PACKAGE_VERSION@
> -Libs: -L${libdir} -linputmapper
> -Cflags: -I${includedir}
> diff --git a/docs/libinputmapper.sym b/docs/libinputmapper.sym
> deleted file mode 100644
> index 05ee012..0000000
> --- a/docs/libinputmapper.sym
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -/*
> - * libinputmapper
> - *
> - * Copyright (c) 2012-2013 David Herrmann <dh.herrmann at gmail.com>
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining
> - * a copy of this software and associated documentation files
> - * (the "Software"), to deal in the Software without restriction, including
> - * without limitation the rights to use, copy, modify, merge, publish,
> - * distribute, sublicense, and/or sell copies of the Software, and to
> - * permit persons to whom the Software is furnished to do so, subject to
> - * the following conditions:
> - *
> - * The above copyright notice and this permission notice shall be included
> - * in all copies or substantial portions of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
> - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
> - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
> - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
> - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
> - */
> -
> -LIBINPUTMAPPER_1 {
> -global:
> - inmap_ctx_new;
> - inmap_ctx_ref;
> - inmap_ctx_unref;
> -
> - inmap_ctx_set_log_fn;
> -
> - inmap_ctx_lookup_by_modalias;
> -
> - inmap_mapping_new;
> - inmap_mapping_ref;
> - inmap_mapping_unref;
> -
> - inmap_mapping_map;
> -
> - inmap_mapping_add_map;
> - inmap_mapping_add_map_from_string;
> -local:
> - *;
> -};
> diff --git a/src/libinputmapper.pc.in b/src/libinputmapper.pc.in
> new file mode 100644
> index 0000000..8677ee1
> --- /dev/null
> +++ b/src/libinputmapper.pc.in
> @@ -0,0 +1,11 @@
> +prefix=@prefix@
> +exec_prefix=@exec_prefix@
> +libdir=@libdir@
> +includedir=@includedir@
> +
> +Name: libinputmapper
> +Description: Input event-mapping library
> +URL: @PACKAGE_URL@
> +Version: @PACKAGE_VERSION@
> +Libs: -L${libdir} -linputmapper
> +Cflags: -I${includedir}
> diff --git a/src/libinputmapper.sym b/src/libinputmapper.sym
> new file mode 100644
> index 0000000..05ee012
> --- /dev/null
> +++ b/src/libinputmapper.sym
> @@ -0,0 +1,46 @@
> +/*
> + * libinputmapper
> + *
> + * Copyright (c) 2012-2013 David Herrmann <dh.herrmann at gmail.com>
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining
> + * a copy of this software and associated documentation files
> + * (the "Software"), to deal in the Software without restriction, including
> + * without limitation the rights to use, copy, modify, merge, publish,
> + * distribute, sublicense, and/or sell copies of the Software, and to
> + * permit persons to whom the Software is furnished to do so, subject to
> + * the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included
> + * in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
> + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
> + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
> + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
> + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +LIBINPUTMAPPER_1 {
> +global:
> + inmap_ctx_new;
> + inmap_ctx_ref;
> + inmap_ctx_unref;
> +
> + inmap_ctx_set_log_fn;
> +
> + inmap_ctx_lookup_by_modalias;
> +
> + inmap_mapping_new;
> + inmap_mapping_ref;
> + inmap_mapping_unref;
> +
> + inmap_mapping_map;
> +
> + inmap_mapping_add_map;
> + inmap_mapping_add_map_from_string;
> +local:
> + *;
> +};
> --
> 1.8.2.1
>
> _______________________________________________
> Input-tools mailing list
> Input-tools at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/input-tools
More information about the Input-tools
mailing list