dmapi: build system revamp

Hi,

Here are Jan Engelhardt's patches originally posted here
http://oss.sgi.com/archives/xfs/2012-05/msg00323.html
as they apply to dmapi.

Patch 2 applied without much modification, patch 3 was not necessary for dmapi, and patch 6 did not apply at all so I implemented that.

Regards,
Ben

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

From: Jan Engelhardt <[email protected]>

Looks like AC_CONFIG_FILES existed since 2.14 already.

---
v2: slight modification for dmapi -bpm

 configure.ac |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Index: dmapi/configure.ac
===================================================================
@@ -1,7 +1,9 @@
-AC_INIT(include/dmapi.h)
+AC_INIT([dmapi], [2.2.10])
+
 AC_PREREQ(2.50)
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_SRCDIR([include/dmapi.h])
 AC_PREFIX_DEFAULT(/usr)
 
 AC_PROG_LIBTOOL

@@ -22,4 +24,5 @@ AC_PACKAGE_NEED_XFS_HANDLE_H
 AC_MANUAL_FORMAT
 AC_MULTILIB($enable_lib64)
 
-AC_OUTPUT(include/builddefs)
+AC_CONFIG_FILES([include/builddefs])
+AC_OUTPUT

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Root entries to where they only can occur.

---

 .gitignore |   82 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 41 insertions(+), 41 deletions(-)

Index: dmapi/.gitignore
===================================================================
@@ -2,38 +2,45 @@
 *.o
 
 # build system
-.census
-Logs/
-include/builddefs
-install-sh
+/.census
+/Logs/
+/include/builddefs
+/install-sh
 
 # magic diretory symlinks
-include/xfs
+/include/xfs
 
 # Makepgs
-build/src-manifest
-build/dmapi-*.tar.gz
-doc/CHANGES.gz
+/build/src-manifest
+/build/dmapi-*.tar.gz
+/doc/CHANGES.gz
 dmapi-*
 
 # autoconf generated files
-aclocal.m4
-autom4te.cache/
-config.guess
-config.log
-config.status
-config.sub
-configure
+/aclocal.m4
+/autom4te.cache/
+/config.guess
+/config.log
+/config.status
+/config.sub
+/configure
 
 # libtool
-libtool
-ltmain.sh
+/libtool
+/ltmain.sh
 *.lo
 *.la
 .libs
 
 # quilt stuff
-.pc/
-patches/
+/.pc/
+/patches/
 
 # binaries
+
+# m4
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

All the patches in this and the related series look good to me. but can you please remove the [PATCH N/N] already in the quilt series?

Right now we have one [patch n/n] generated by quilt and then another mismatching one, which I think would even land in the git commit log.

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Hey Christoph,

Aha. I will clean up the extra [patch n/n]. I didn't expect it would do that.

Thanks for the review!

-Ben

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

These two patches are committed to git://oss.sgi.com/xfs/cmds/dmapi.git, master branch.

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs