Browse Source

Import Gnulib array-list

Andrew Young 8 years ago
parent
commit
5ff3b11c02
5 changed files with 71 additions and 2 deletions
  1. 2 1
      configure.ac
  2. 10 0
      lib/.gitignore
  3. 10 0
      m4/.gitignore
  4. 48 0
      m4/gnulib-cache.m4
  5. 1 1
      src/Makefile.am

+ 2 - 1
configure.ac

@@ -8,12 +8,12 @@ AC_CONFIG_MACRO_DIR([m4])
 
 # Check for programs
 AC_PROG_CC   # c compiler
+gl_EARLY     # gnu lib
 AM_PROG_CC_C_O
 AM_PROG_LEX  # flex
 AC_PROG_YACC # bison
 
 # gnulib macros
-gl_EARLY
 gl_INIT
 
 # Check for headers
@@ -25,6 +25,7 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([
  Makefile
  src/Makefile
+ lib/Makefile
  tests/Makefile
 ])
 AC_OUTPUT

+ 10 - 0
lib/.gitignore

@@ -0,0 +1,10 @@
+/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

+ 10 - 0
m4/.gitignore

@@ -0,0 +1,10 @@
+/00gnulib.m4
+/gnulib-common.m4
+/gnulib-comp.m4
+/gnulib-tool.m4
+/onceonly.m4
+/gl_list.m4
+/inline.m4
+/size_max.m4
+/stdbool.m4
+/xsize.m4

+ 48 - 0
m4/gnulib-cache.m4

@@ -0,0 +1,48 @@
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+#
+# This file represents the specification of how gnulib-tool is used.
+# It acts as a cache: It is written and read by gnulib-tool.
+# In projects that use version control, this file is meant to be put under
+# version control, like the configure.ac and various Makefile.am files.
+
+
+# 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
+
+# Specification in the form of a few gnulib-tool.m4 macro invocations:
+gl_LOCAL_DIR([])
+gl_MODULES([
+  array-list
+  diffseq
+])
+gl_AVOID([])
+gl_SOURCE_BASE([lib])
+gl_M4_BASE([m4])
+gl_PO_BASE([])
+gl_DOC_BASE([doc])
+gl_TESTS_BASE([tests])
+gl_LIB([libgnu])
+gl_MAKEFILE_NAME([])
+gl_MACRO_PREFIX([gl])
+gl_PO_DOMAIN([])
+gl_WITNESS_C_DOMAIN([])

+ 1 - 1
src/Makefile.am

@@ -5,7 +5,7 @@ BUILT_SOURCES = org_parser.h org_lexer.h
 AM_YFLAGS = -d
 AM_LFLAGS = 
 
-org_merge_driver_SOURCES = org_parser.y org_lexer.l main.c
+org_merge_driver_SOURCES = org_parser.y org_lexer.l main.c elt_heading.c tree.c
 
 org_lexer.h: org_lexer.l
 	lex $^