On Wed, 2013-06-12 at 15:15 -0300, Dan Winship wrote: > Removing the submodule at this point will just cause more git pain, but > we could remove it from SUBDIRS until it gets fixed.
New patch attached.
>From 709ecbeac8472469496607c76ae4b487e4173f8e Mon Sep 17 00:00:00 2001 From: Colin Walters <[email protected]> Date: Wed, 12 Jun 2013 08:36:29 -0400 Subject: [PATCH] build: Remove libndp for now It's installing itself into $(prefix), whereas we need a private library in $(pkglibdir). I think libgsystem is a pretty good example of a useful git submodule; it's designed for nonrecursive automake; it provides a Makefile-libgsystem.am that one can include, but doesn't force the use of SUBDIRS and particularly that the *containing* module does e.g. include libgsystem/Makefile-libgsystem.am pkglibdir_LTLIBRARIES += libgsystem.la So the containing module is choosing where to install. --- Makefile.am | 1 - configure.ac | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3fcc135..9976a2a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,6 @@ SUBDIRS = \ libnm-util \ libnm-glib \ introspection \ - libndp \ src \ callouts \ cli \ diff --git a/configure.ac b/configure.ac index 51f4aec..4f1649f 100644 --- a/configure.ac +++ b/configure.ac @@ -715,7 +715,6 @@ examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile ]) -AC_CONFIG_SUBDIRS([libndp]) AC_OUTPUT # Print build configuration -- 1.7.1
_______________________________________________ networkmanager-list mailing list [email protected] https://mail.gnome.org/mailman/listinfo/networkmanager-list
