11:59 a.m.
While trying to make 'distcheck' work again, this is where I got so far.
Unfortunately, distcheck is still not working.
Michal Privoznik (2):
tools: Compile generate-api-docs into builddir
configure.ac: Slightly rework
configure.ac | 11 ++++++-----
tools/Makefile.am | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
--
2.7.3
11:59 a.m.
New subject: [libvirt] [libvirt-php][PATCH 1/2] tools: Compile generate-api-docs into builddir
Since we are building this file every single time, there's no
need for us requiring it to be in srcdir and thus part of a
.tar.gz.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tools/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6d3f6bc..73386ef 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -12,7 +12,7 @@ doc_generated_files = \
$(doc_generated_files): $(APIBUILD_STAMP)
-$(APIBUILD_STAMP): $(srcdir)/generate-api-docs
+$(APIBUILD_STAMP): generate-api-docs
./generate-api-docs $(top_srcdir)/src/libvirt-php.c ../docs/api-reference.html.in
./generate-api-docs --private $(top_srcdir)/src/libvirt-php.c
../docs/dev-api-reference.html.in
touch $@
--
2.7.3
9:30 a.m.
New subject: [libvirt] [libvirt-php][PATCH 1/2] tools: Compile generate-api-docs into builddir
On Tue, Apr 19, 2016 at 12:59 PM, Michal Privoznik <mprivozn(a)redhat.com> wrote:
Since we are building this file every single time, there's no
need for us requiring it to be in srcdir and thus part of a
.tar.gz.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tools/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6d3f6bc..73386ef 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -12,7 +12,7 @@ doc_generated_files = \
$(doc_generated_files): $(APIBUILD_STAMP)
-$(APIBUILD_STAMP): $(srcdir)/generate-api-docs
+$(APIBUILD_STAMP): generate-api-docs
./generate-api-docs $(top_srcdir)/src/libvirt-php.c
../docs/api-reference.html.in
./generate-api-docs --private $(top_srcdir)/src/libvirt-php.c
../docs/dev-api-reference.html.in
touch $@
--
2.7.3
Looks good to me here.
--
真実はいつも一つ！/ Always, there's only one truth!
11:59 a.m.
New subject: [libvirt] [libvirt-php][PATCH 2/2] configure.ac: Slightly rework
Firstly, AC_INIT() macro accepts more arguments than we currently
pass. Then, it's considered a good practice to specify
AC_CONFIG_SRCDIR() too. The rest is just some reorganization so
that common things are close to each other rather than
distributed randomly in the file.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
configure.ac | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 51a2cfe..2549b55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
-AC_INIT([libvirt-php], [0.5.1], [http://libvirt.org])
+AC_INIT([libvirt-php], [0.5.1], [libvir-list(a)redhat.com], [], [http://libvirt.org])
+AC_CONFIG_SRCDIR([src/libvirt-php.c])
+AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability])
-AC_CONFIG_FILES([Makefile tools/Makefile src/Makefile tests/Makefile docs/Makefile])
AM_MAINTAINER_MODE([enable])
m4_ifndef([LT_INIT], [
@@ -157,10 +158,10 @@ if test "$OS" = "Darwin"; then
else
SHLIB_FLAGS="-shared -rdynamic"
fi
-AC_SUBST([SHLIB_FLAGS])
+AC_SUBST([SHLIB_FLAGS])
AC_SUBST([PHPIZE])
AC_SUBST([PHPCONFIG])
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([libvirt-php.spec])
+AC_CONFIG_FILES([Makefile tools/Makefile src/Makefile \
+ tests/Makefile docs/Makefile libvirt-php.spec])
AC_OUTPUT
--
2.7.3
9:30 a.m.
New subject: [libvirt] [libvirt-php][PATCH 2/2] configure.ac: Slightly rework
On Tue, Apr 19, 2016 at 12:59 PM, Michal Privoznik <mprivozn(a)redhat.com> wrote:
Firstly, AC_INIT() macro accepts more arguments than we currently
pass. Then, it's considered a good practice to specify
AC_CONFIG_SRCDIR() too. The rest is just some reorganization so
that common things are close to each other rather than
distributed randomly in the file.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
configure.ac | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 51a2cfe..2549b55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
-AC_INIT([libvirt-php], [0.5.1], [http://libvirt.org])
+AC_INIT([libvirt-php], [0.5.1], [libvir-list(a)redhat.com], [], [http://libvirt.org])
+AC_CONFIG_SRCDIR([src/libvirt-php.c])
+AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability])
-AC_CONFIG_FILES([Makefile tools/Makefile src/Makefile tests/Makefile docs/Makefile])
AM_MAINTAINER_MODE([enable])
m4_ifndef([LT_INIT], [
@@ -157,10 +158,10 @@ if test "$OS" = "Darwin"; then
else
SHLIB_FLAGS="-shared -rdynamic"
fi
-AC_SUBST([SHLIB_FLAGS])
+AC_SUBST([SHLIB_FLAGS])
AC_SUBST([PHPIZE])
AC_SUBST([PHPCONFIG])
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([libvirt-php.spec])
+AC_CONFIG_FILES([Makefile tools/Makefile src/Makefile \
+ tests/Makefile docs/Makefile libvirt-php.spec])
AC_OUTPUT
--
2.7.3
Looks good to me.
--
真実はいつも一つ！/ Always, there's only one truth!
9:31 a.m.
On Tue, Apr 19, 2016 at 12:59 PM, Michal Privoznik <mprivozn(a)redhat.com> wrote:
While trying to make 'distcheck' work again, this is where I
got so far.
Unfortunately, distcheck is still not working.
Michal Privoznik (2):
tools: Compile generate-api-docs into builddir
configure.ac: Slightly rework
configure.ac | 11 ++++++-----
tools/Makefile.am | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
--
2.7.3
I didn't see a problem with this patch set in testing, so go ahead and apply it!
--
真実はいつも一つ！/ Always, there's only one truth!
3182
days inactive
3183
days old
5 comments
2 participants
participants (2)
-
Michal Privoznik -
Neal Gompa