diff options
| author | Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org> | 2017-10-05 03:27:03 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2017-10-16 21:50:18 +0300 |
| commit | 53b735f14a9a1df23b054f15ce148e2fa36abe0f (patch) | |
| tree | 3c0d3109930fa85a2b93fe8986df688775ce419e | |
| parent | 4df71d3f5450452a654bb7e94f8b3fed948ed31e (diff) | |
helper: move libodphelper.pc.in to helper directory
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | helper/Makefile.am | 2 | ||||
| -rw-r--r-- | helper/libodphelper.pc.in (renamed from pkgconfig/libodphelper.pc.in) | 0 | ||||
| -rw-r--r-- | helper/m4/configure.m4 | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index c5bb7505f..345212cf4 100644 --- a/configure.ac +++ b/configure.ac @@ -357,9 +357,7 @@ esac CFLAGS="$CFLAGS $ODP_CFLAGS" CXXFLAGS="$CXXFLAGS $ODP_CXXFLAGS" -AC_CONFIG_FILES([Makefile - pkgconfig/libodphelper.pc - ]) +AC_CONFIG_FILES([Makefile]) ########################################################################## # distribute the changed variables among the Makefiles diff --git a/helper/Makefile.am b/helper/Makefile.am index bf75b467e..c668386d9 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -1,5 +1,5 @@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc +pkgconfig_DATA = libodphelper.pc LIB = $(top_builddir)/lib AM_CPPFLAGS = -I$(srcdir)/include diff --git a/pkgconfig/libodphelper.pc.in b/helper/libodphelper.pc.in index b14335e5c..b14335e5c 100644 --- a/pkgconfig/libodphelper.pc.in +++ b/helper/libodphelper.pc.in diff --git a/helper/m4/configure.m4 b/helper/m4/configure.m4 index 2e2943d14..3a867e8cb 100644 --- a/helper/m4/configure.m4 +++ b/helper/m4/configure.m4 @@ -19,4 +19,5 @@ AC_ARG_ENABLE([helper-linux], fi]) AC_CONFIG_FILES([helper/Makefile - helper/test/Makefile]) + helper/libodphelper.pc + helper/test/Makefile]) |