Changeset 3f3b731d

Timestamp:

Jul 4, 2016, 11:34:57 AM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

0a2c1f1

Parents:

302d3bf3 (diff), 854a32c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/libcfa

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (7 diffs)

src/libcfa/Makefile.am

@@ -64 +64 @@
 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
 
-include_HEADERS = ${headers}
+nobase_include_HEADERS = ${headers}
 
 CLEANFILES = libcfa-prelude.c

src/libcfa/Makefile.in

@@ -39 +39 @@
 POST_UNINSTALL = :
 subdir = src/libcfa
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -117 +117 @@
 DIST_SOURCES = $(libcfa_a_SOURCES)
 DATA = $(cfalib_DATA)
-HEADERS = $(include_HEADERS)
+HEADERS = $(nobase_include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -236 +236 @@
 libobjs = ${headers:=.o}
 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
-include_HEADERS = ${headers}
+nobase_include_HEADERS = ${headers}
 CLEANFILES = libcfa-prelude.c
 all: all-am
@@ -368 +368 @@
         files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
         dir='$(DESTDIR)$(cfalibdir)'; $(am__uninstall_files_from_dir)
-install-includeHEADERS: $(include_HEADERS)
+install-nobase_includeHEADERS: $(nobase_include_HEADERS)
         @$(NORMAL_INSTALL)
         test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-        @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
+        @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
+        $(am__nobase_list) | while read dir files; do \
+          xfiles=; for file in $$files; do \
+            if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+            else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+          test -z "$$xfiles" || { \
+            test "x$$dir" = x. || { \
+              echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
+              $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
+            echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
+            $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
         done
 
-uninstall-includeHEADERS:
+uninstall-nobase_includeHEADERS:
         @$(NORMAL_UNINSTALL)
-        @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+        @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
+        $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
         dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
 
@@ -530 +533 @@
 info-am:
 
-install-data-am: install-cfalibDATA install-includeHEADERS
+install-data-am: install-cfalibDATA install-nobase_includeHEADERS
 
 install-dvi: install-dvi-am
@@ -575 +578 @@
 ps-am:
 
-uninstall-am: uninstall-cfalibDATA uninstall-includeHEADERS \
-        uninstall-libLIBRARIES
+uninstall-am: uninstall-cfalibDATA uninstall-libLIBRARIES \
+        uninstall-nobase_includeHEADERS
 
 .MAKE: install-am install-strip
@@ -586 +589 @@
         install-data install-data-am install-dvi install-dvi-am \
         install-exec install-exec-am install-html install-html-am \
-        install-includeHEADERS install-info install-info-am \
-        install-libLIBRARIES install-man install-pdf install-pdf-am \
+        install-info install-info-am install-libLIBRARIES install-man \
+        install-nobase_includeHEADERS install-pdf install-pdf-am \
         install-ps install-ps-am install-strip installcheck \
         installcheck-am installdirs maintainer-clean \
         maintainer-clean-generic mostlyclean mostlyclean-compile \
         mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-        uninstall-am uninstall-cfalibDATA uninstall-includeHEADERS \
-        uninstall-libLIBRARIES
+        uninstall-am uninstall-cfalibDATA uninstall-libLIBRARIES \
+        uninstall-nobase_includeHEADERS