Changeset 3f3b731d


Ignore:
Timestamp:
Jul 4, 2016, 11:34:57 AM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, 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:
2 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/Makefile.am

    r302d3bf3 r3f3b731d  
    6464libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
    6565
    66 include_HEADERS = ${headers}
     66nobase_include_HEADERS = ${headers}
    6767
    6868CLEANFILES = libcfa-prelude.c
  • src/libcfa/Makefile.in

    r302d3bf3 r3f3b731d  
    3939POST_UNINSTALL = :
    4040subdir = src/libcfa
    41 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     41DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
    4242        $(srcdir)/Makefile.in
    4343ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    117117DIST_SOURCES = $(libcfa_a_SOURCES)
    118118DATA = $(cfalib_DATA)
    119 HEADERS = $(include_HEADERS)
     119HEADERS = $(nobase_include_HEADERS)
    120120ETAGS = etags
    121121CTAGS = ctags
     
    236236libobjs = ${headers:=.o}
    237237libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
    238 include_HEADERS = ${headers}
     238nobase_include_HEADERS = ${headers}
    239239CLEANFILES = libcfa-prelude.c
    240240all: all-am
     
    368368        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
    369369        dir='$(DESTDIR)$(cfalibdir)'; $(am__uninstall_files_from_dir)
    370 install-includeHEADERS: $(include_HEADERS)
     370install-nobase_includeHEADERS: $(nobase_include_HEADERS)
    371371        @$(NORMAL_INSTALL)
    372372        test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
    373         @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
    374         for p in $$list; do \
    375           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    376           echo "$$d$$p"; \
    377         done | $(am__base_list) | \
    378         while read files; do \
    379           echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
    380           $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
     373        @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
     374        $(am__nobase_list) | while read dir files; do \
     375          xfiles=; for file in $$files; do \
     376            if test -f "$$file"; then xfiles="$$xfiles $$file"; \
     377            else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
     378          test -z "$$xfiles" || { \
     379            test "x$$dir" = x. || { \
     380              echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
     381              $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
     382            echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
     383            $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
    381384        done
    382385
    383 uninstall-includeHEADERS:
     386uninstall-nobase_includeHEADERS:
    384387        @$(NORMAL_UNINSTALL)
    385         @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
    386         files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
     388        @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
     389        $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
    387390        dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
    388391
     
    530533info-am:
    531534
    532 install-data-am: install-cfalibDATA install-includeHEADERS
     535install-data-am: install-cfalibDATA install-nobase_includeHEADERS
    533536
    534537install-dvi: install-dvi-am
     
    575578ps-am:
    576579
    577 uninstall-am: uninstall-cfalibDATA uninstall-includeHEADERS \
    578         uninstall-libLIBRARIES
     580uninstall-am: uninstall-cfalibDATA uninstall-libLIBRARIES \
     581        uninstall-nobase_includeHEADERS
    579582
    580583.MAKE: install-am install-strip
     
    586589        install-data install-data-am install-dvi install-dvi-am \
    587590        install-exec install-exec-am install-html install-html-am \
    588         install-includeHEADERS install-info install-info-am \
    589         install-libLIBRARIES install-man install-pdf install-pdf-am \
     591        install-info install-info-am install-libLIBRARIES install-man \
     592        install-nobase_includeHEADERS install-pdf install-pdf-am \
    590593        install-ps install-ps-am install-strip installcheck \
    591594        installcheck-am installdirs maintainer-clean \
    592595        maintainer-clean-generic mostlyclean mostlyclean-compile \
    593596        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
    594         uninstall-am uninstall-cfalibDATA uninstall-includeHEADERS \
    595         uninstall-libLIBRARIES
     597        uninstall-am uninstall-cfalibDATA uninstall-libLIBRARIES \
     598        uninstall-nobase_includeHEADERS
    596599
    597600
Note: See TracChangeset for help on using the changeset viewer.