Changeset a5c722b

Timestamp:

Jul 20, 2018, 9:59:20 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

982b0a5

Parents:

3a8cc12

Message:

Moved config.h.in to src

Files:

• Makefile.in (modified) (3 diffs)
• configure (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• src/config.h.in (moved) (moved from config.h.in) (1 diff)

Makefile.in

@@ -170 +170 @@
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
         cscope distdir dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-        $(LISP)config.h.in
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -192 +191 @@
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-        $(top_srcdir)/automake/compile \
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/compile \
         $(top_srcdir)/automake/config.guess \
         $(top_srcdir)/automake/config.sub \
         $(top_srcdir)/automake/install-sh \
-        $(top_srcdir)/automake/missing INSTALL README automake/compile \
-        automake/config.guess automake/config.sub automake/depcomp \
-        automake/install-sh automake/missing automake/ylwrap
+        $(top_srcdir)/automake/missing $(top_srcdir)/src/config.h.in \
+        INSTALL README automake/compile automake/config.guess \
+        automake/config.sub automake/depcomp automake/install-sh \
+        automake/missing automake/ylwrap
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -409 +408 @@
         @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+stamp-h1: $(top_srcdir)/src/config.h.in $(top_builddir)/config.status
         @rm -f stamp-h1
         cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+$(top_srcdir)/src/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
         ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
         rm -f stamp-h1

configure

@@ -2492 +2492 @@
 
 #AC_CONFIG_SRCDIR([src/main.cc])
-ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers config.h:src/config.h.in"
 
 # Check whether --enable-silent-rules was given.
@@ -7050 +7050 @@
 do
   case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:src/config.h.in" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;

configure.ac

@@ -6 +6 @@
 AC_CONFIG_AUX_DIR([automake])
 #AC_CONFIG_SRCDIR([src/main.cc])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([config.h:src/config.h.in])
 AM_SILENT_RULES([no])
 

src/config.h.in

@@ -1 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
+/* src/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Location of include files. */