Browse Source

Modify gnulib directories.

gnulib now uses ./gnulib/{lib,tests} instead of exporting into the project root.
Andrew Young 8 years ago
parent
commit
d47506a6ae
4 changed files with 6 additions and 17 deletions
  1. 1 1
      Makefile.am
  2. 1 1
      configure.ac
  3. 0 11
      lib/.gitignore
  4. 4 4
      m4/gnulib-cache.m4

+ 1 - 1
Makefile.am

@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src tests lib
+SUBDIRS = src tests gnulib/lib
 dist_doc_DATA = README
 EXTRA_DIST = autogen.sh m4/gnulib-cache.m4

+ 1 - 1
configure.ac

@@ -30,7 +30,7 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([
  Makefile
  src/Makefile
- lib/Makefile
+ gnulib/lib/Makefile
  tests/Makefile
 ])
 AC_OUTPUT

+ 0 - 11
lib/.gitignore

@@ -1,11 +0,0 @@
-/Makefile.am
-/dummy.c
-/gl_array_list.c
-/gl_array_list.h
-/gl_list.c
-/gl_list.h
-/size_max.h
-/stdbool.in.h
-/xsize.h
-/diffseq.h
-/minmax.h

+ 4 - 4
m4/gnulib-cache.m4

@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=config --no-conditional-dependencies --no-libtool --macro-prefix=gl array-list diffseq minmax
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=m4 --doc-base=gnulib/doc --tests-base=gnulib/tests --aux-dir=config --no-conditional-dependencies --no-libtool --macro-prefix=gl array-list diffseq minmax
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -37,11 +37,11 @@ gl_MODULES([
   minmax
 ])
 gl_AVOID([])
-gl_SOURCE_BASE([lib])
+gl_SOURCE_BASE([gnulib/lib])
 gl_M4_BASE([m4])
 gl_PO_BASE([])
-gl_DOC_BASE([doc])
-gl_TESTS_BASE([tests])
+gl_DOC_BASE([gnulib/doc])
+gl_TESTS_BASE([gnulib/tests])
 gl_LIB([libgnu])
 gl_MAKEFILE_NAME([])
 gl_MACRO_PREFIX([gl])