diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2014-07-26 15:52:14 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2014-07-26 15:52:14 +0300 |
commit | 835cf591f2d7d9beff22adb32d7755da38779070 (patch) | |
tree | ea7e342726a9dd6744ccccaeb859f1d6200545e0 /lib | |
parent | 8e1f5a53201184ff42348f9d4cf230f765d1441d (diff) | |
download | mailutils-835cf591f2d7d9beff22adb32d7755da38779070.tar.gz mailutils-835cf591f2d7d9beff22adb32d7755da38779070.tar.bz2 |
Move gnulib into a subdir.
* bootstrap.conf: Create and populate lib/gnu, if necessary.
* configure.ac (MU_APP_COMMON_INCLUDES): Update.
(AC_CONFIG_FILES): Build lib/gnu/Makefile
* lib/Makefile.am (libmuaux_a_SOURCES): Add all objects from gnu/
* po/POTFILES.in: Update.
* examples/.gitignore: Update.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Makefile.am | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 559dd39ee..9bda10f61 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -15,11 +15,11 @@ ## You should have received a copy of the GNU General Public License ## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. -include gnulib.mk +SUBDIRS = gnu . -AM_CPPFLAGS += @MU_LIB_COMMON_INCLUDES@ - -libmuaux_a_SOURCES += \ +AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/lib/gnu -I${top_builddir}/lib/gnu +noinst_LIBRARIES = libmuaux.a +libmuaux_a_SOURCES = \ argp_base.c\ daemon.c\ mailcap.c\ @@ -29,14 +29,14 @@ libmuaux_a_SOURCES += \ tcpwrap.c\ mu_umaxtostr.c\ mu_umaxtostr.h +libmuaux_a_LIBADD=gnu/*.o +#libmuaux_a_LIBADD=`$(AR) t gnu/libgnu.a | sed s.^.gnu/.` -noinst_HEADERS +=\ +noinst_HEADERS =\ mailcap.h\ muaux.h\ tcpwrap.h -EXTRA_DIST += utmp.c -gl_LIBOBJS += @LIBOBJS@ -gl_LTLIBOBJS += @LTLIBOBJS@ +EXTRA_DIST = utmp.c |