Changeset ff2d7341


Ignore:
Timestamp:
Jan 11, 2017, 4:06:49 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
bb82c03
Parents:
17e5e2b
Message:

Modified makefiles and cfa to install headers to include/cfa instead of include/

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • configure

    r17e5e2b rff2d7341  
    32143214
    32153215if test "$includedir" = '${prefix}/include'; then
    3216         cfa_incdir="${cfa_prefix}/include"
     3216        cfa_incdir="${cfa_prefix}/include/cfa"
    32173217else
    32183218        cfa_incdir=${includedir}
  • configure.ac

    r17e5e2b rff2d7341  
    122122
    123123if test "$includedir" = '${prefix}/include'; then
    124         cfa_incdir="${cfa_prefix}/include"
     124        cfa_incdir="${cfa_prefix}/include/cfa"
    125125else
    126126        cfa_incdir=${includedir}
  • src/driver/cfa.cc

    r17e5e2b rff2d7341  
    246246        if ( link ) {
    247247                #if ! defined(HAVE_LIBCFA_RELEASE)
    248                         if( !debug ) { 
     248                        if( !debug ) {
    249249                                cerr << "error: Option -nodebug is not available, libcfa was not installed." << endl;
    250250                                exit( EXIT_FAILURE );
     
    252252                #endif
    253253                #if ! defined(HAVE_LIBCFA_DEBUG)
    254                         if( debug ) { 
     254                        if( debug ) {
    255255                                cerr << "error: Option -debug is not available, libcfa-d was not installed." << endl;
    256256                                exit( EXIT_FAILURE );
  • src/libcfa/Makefile.am

    r17e5e2b rff2d7341  
    6565stdhdr = ${shell echo stdhdr/*}
    6666
    67 nobase_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
     67cfa_includedir = $(includedir)/cfa
     68nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
    6869
    6970CLEANFILES = libcfa-prelude.c
  • src/libcfa/Makefile.in

    r17e5e2b rff2d7341  
    4242@BUILD_DEBUG_TRUE@am__append_2 = libcfa-d.a
    4343subdir = src/libcfa
    44 DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
     44DIST_COMMON = $(nobase_cfa_include_HEADERS) $(srcdir)/Makefile.am \
    4545        $(srcdir)/Makefile.in
    4646ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    7979         $(am__cd) "$$dir" && rm -f $$files; }; \
    8080  }
    81 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
     81am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cfa_includedir)"
    8282LIBRARIES = $(lib_LIBRARIES)
    8383AR = ar
     
    144144SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
    145145DIST_SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
    146 HEADERS = $(nobase_include_HEADERS)
     146HEADERS = $(nobase_cfa_include_HEADERS)
    147147ETAGS = etags
    148148CTAGS = ctags
     
    281281libcfa_d_a_CFLAGS = -debug -O0
    282282stdhdr = ${shell echo stdhdr/*}
    283 nobase_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
     283cfa_includedir = $(includedir)/cfa
     284nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
    284285CLEANFILES = libcfa-prelude.c
    285286all: all-am
     
    761762@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    762763@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-invoke.obj `if test -f 'concurrency/invoke.c'; then $(CYGPATH_W) 'concurrency/invoke.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/invoke.c'; fi`
    763 install-nobase_includeHEADERS: $(nobase_include_HEADERS)
     764install-nobase_cfa_includeHEADERS: $(nobase_cfa_include_HEADERS)
    764765        @$(NORMAL_INSTALL)
    765         test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
    766         @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
     766        test -z "$(cfa_includedir)" || $(MKDIR_P) "$(DESTDIR)$(cfa_includedir)"
     767        @list='$(nobase_cfa_include_HEADERS)'; test -n "$(cfa_includedir)" || list=; \
    767768        $(am__nobase_list) | while read dir files; do \
    768769          xfiles=; for file in $$files; do \
     
    771772          test -z "$$xfiles" || { \
    772773            test "x$$dir" = x. || { \
    773               echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
    774               $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
    775             echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
    776             $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
     774              echo "$(MKDIR_P) '$(DESTDIR)$(cfa_includedir)/$$dir'"; \
     775              $(MKDIR_P) "$(DESTDIR)$(cfa_includedir)/$$dir"; }; \
     776            echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(cfa_includedir)/$$dir'"; \
     777            $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(cfa_includedir)/$$dir" || exit $$?; }; \
    777778        done
    778779
    779 uninstall-nobase_includeHEADERS:
     780uninstall-nobase_cfa_includeHEADERS:
    780781        @$(NORMAL_UNINSTALL)
    781         @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
     782        @list='$(nobase_cfa_include_HEADERS)'; test -n "$(cfa_includedir)" || list=; \
    782783        $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
    783         dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
     784        dir='$(DESTDIR)$(cfa_includedir)'; $(am__uninstall_files_from_dir)
    784785
    785786ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
     
    869870all-am: Makefile $(LIBRARIES) $(HEADERS)
    870871installdirs:
    871         for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
     872        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cfa_includedir)"; do \
    872873          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
    873874        done
     
    929930info-am:
    930931
    931 install-data-am: install-nobase_includeHEADERS
     932install-data-am: install-nobase_cfa_includeHEADERS
    932933
    933934install-dvi: install-dvi-am
     
    975976ps-am:
    976977
    977 uninstall-am: uninstall-libLIBRARIES uninstall-nobase_includeHEADERS
     978uninstall-am: uninstall-libLIBRARIES \
     979        uninstall-nobase_cfa_includeHEADERS
    978980
    979981.MAKE: install-am install-strip
     
    986988        install-exec-am install-html install-html-am install-info \
    987989        install-info-am install-libLIBRARIES install-man \
    988         install-nobase_includeHEADERS install-pdf install-pdf-am \
     990        install-nobase_cfa_includeHEADERS install-pdf install-pdf-am \
    989991        install-ps install-ps-am install-strip installcheck \
    990992        installcheck-am installdirs maintainer-clean \
     
    992994        mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
    993995        tags uninstall uninstall-am uninstall-libLIBRARIES \
    994         uninstall-nobase_includeHEADERS
     996        uninstall-nobase_cfa_includeHEADERS
    995997
    996998
Note: See TracChangeset for help on using the changeset viewer.