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. --- .gitmodules | 3 --- Makefile.am | 1 - configure.ac | 1 - libndp | 1 - 4 files changed, 0 insertions(+), 6 deletions(-) delete mode 160000 libndp
>From 36d83e054b8bf90dc8b0e820617e3ff17f134ba7 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. --- .gitmodules | 3 --- Makefile.am | 1 - configure.ac | 1 - libndp | 1 - 4 files changed, 0 insertions(+), 6 deletions(-) delete mode 160000 libndp diff --git a/.gitmodules b/.gitmodules index c31ff2a..e93bbea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "libgsystem"] path = libgsystem url = git://git.gnome.org/libgsystem -[submodule "libndp"] - path = libndp - url = git://github.com/jpirko/libndp.git 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 diff --git a/libndp b/libndp deleted file mode 160000 index 39e1f53..0000000 --- a/libndp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 39e1f53dd4efc00b84ff097b15558747c92593f2 -- 1.7.1
_______________________________________________ networkmanager-list mailing list [email protected] https://mail.gnome.org/mailman/listinfo/networkmanager-list
