On Wed, Nov 12, 2014 at 03:06:04PM +0100, Thomas Graf wrote:
> From: Rob Adams <read...@readams.net>
>
> Add rule to generate pkgconfig .pc file from configure.
> Install pkg-config file to $(libdir)/pkgconfig
>
> Signed-off-by: Rob Adams <read...@readams.net>
> ---
> AUTHORS | 1 +
> Makefile.am | 2 ++
> configure.ac | 1 +
> lib/.gitignore | 1 +
> lib/automake.mk | 3 +++
> lib/libopenvswitch.pc.in | 11 +++++++++++
> 6 files changed, 19 insertions(+)
> create mode 100644 lib/libopenvswitch.pc.in
>
> diff --git a/AUTHORS b/AUTHORS
> index 2d30cb1..b5ac696 100644
> --- a/AUTHORS
> +++ b/AUTHORS
> @@ -123,6 +123,7 @@ Reid Price r...@nicira.com
> Remko Tronçon g...@el-tramo.be
> Rich Lane rl...@bigswitch.com
> Rishi Bamba rishi.ba...@tcs.com
> +Rob Adams read...@readams.net
> Rob Hoes rob.h...@citrix.com
> Romain Lenglet romain.leng...@berabera.info
> Ryan Wilson wr...@nicira.com
> diff --git a/Makefile.am b/Makefile.am
> index 8e6de5f..6d2a9f1 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -125,8 +125,10 @@ scripts_SCRIPTS =
> scripts_DATA =
> SUFFIXES =
> check_DATA =
> +pkgconfig_DATA =
git complains about an extra white space above.
That is the only problem I have found, so maybe Ben
can fold in the change to avoid another post.
Otherwise,
Acked-by: Flavio Leitner <f...@redhat.com>
>
> scriptsdir = $(pkgdatadir)/scripts
> +pkgconfigdir = $(libdir)/pkgconfig
>
> # This ensures that files added to EXTRA_DIST are always distributed,
> # even if they are inside an Automake if...endif conditional block that is
> diff --git a/configure.ac b/configure.ac
> index 8cd48ca..adc38a6 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -173,6 +173,7 @@ AC_CONFIG_FILES(datapath/linux/Makefile)
> AC_CONFIG_FILES(datapath/linux/Makefile.main)
> AC_CONFIG_FILES(include/Makefile)
> AC_CONFIG_FILES(tests/atlocal)
> +AC_CONFIG_FILES(lib/libopenvswitch.pc)
>
> dnl This makes sure that include/openflow gets created in the build
> directory.
> AC_CONFIG_COMMANDS([include/openflow/openflow.h.stamp])
> diff --git a/lib/.gitignore b/lib/.gitignore
> index 2b4a231..41f1bac 100644
> --- a/lib/.gitignore
> +++ b/lib/.gitignore
> @@ -17,3 +17,4 @@
> /vtep-idl.c
> /vtep-idl.h
> /vtep-idl.ovsidl
> +/libopenvswitch.pc
> diff --git a/lib/automake.mk b/lib/automake.mk
> index 5ce93a3..049dcac 100644
> --- a/lib/automake.mk
> +++ b/lib/automake.mk
> @@ -386,6 +386,9 @@ else
> lib_libopenvswitch_la_SOURCES += lib/stream-nossl.c
> endif
>
> +pkgconfig_DATA += \
> + $(srcdir)/lib/libopenvswitch.pc
> +
> EXTRA_DIST += \
> lib/dh1024.pem \
> lib/dh2048.pem \
> diff --git a/lib/libopenvswitch.pc.in b/lib/libopenvswitch.pc.in
> new file mode 100644
> index 0000000..2a3f2ca
> --- /dev/null
> +++ b/lib/libopenvswitch.pc.in
> @@ -0,0 +1,11 @@
> +prefix=@prefix@
> +exec_prefix=@exec_prefix@
> +libdir=@libdir@
> +includedir=@includedir@
> +
> +Name: libopenvswitch
> +Description: Open vSwitch library
> +Version: @VERSION@
> +Libs: -L${libdir} -lopenvswitch
> +Libs.private: @LIBS@
> +Cflags: -I${includedir}/openvswitch
> --
> 1.9.3
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
