Changeset ff2d7341 for src/libcfa

Timestamp:

Jan 11, 2017, 4:06:49 PM (8 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

bb82c03

Parents:

17e5e2b

Message:

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

Location:

src/libcfa

Files:

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

src/libcfa/Makefile.am ¶

@@ -65 +65 @@
 stdhdr = ${shell echo stdhdr/*}
 
-nobase_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
+cfa_includedir = $(includedir)/cfa
+nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
 
 CLEANFILES = libcfa-prelude.c

src/libcfa/Makefile.in ¶

@@ -42 +42 @@
 @BUILD_DEBUG_TRUE@am__append_2 = libcfa-d.a
 subdir = src/libcfa
-DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(nobase_cfa_include_HEADERS) $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -79 +79 @@
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cfa_includedir)"
 LIBRARIES = $(lib_LIBRARIES)
 AR = ar
@@ -144 +144 @@
 SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
 DIST_SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
-HEADERS = $(nobase_include_HEADERS)
+HEADERS = $(nobase_cfa_include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -281 +281 @@
 libcfa_d_a_CFLAGS = -debug -O0
 stdhdr = ${shell echo stdhdr/*}
-nobase_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
+cfa_includedir = $(includedir)/cfa
+nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
 CLEANFILES = libcfa-prelude.c
 all: all-am
@@ -761 +762 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @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`
-install-nobase_includeHEADERS: $(nobase_include_HEADERS)
+install-nobase_cfa_includeHEADERS: $(nobase_cfa_include_HEADERS)
         @$(NORMAL_INSTALL)
-        test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-        @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
+        test -z "$(cfa_includedir)" || $(MKDIR_P) "$(DESTDIR)$(cfa_includedir)"
+        @list='$(nobase_cfa_include_HEADERS)'; test -n "$(cfa_includedir)" || list=; \
         $(am__nobase_list) | while read dir files; do \
           xfiles=; for file in $$files; do \
@@ -771 +772 @@
           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 $$?; }; \
+              echo "$(MKDIR_P) '$(DESTDIR)$(cfa_includedir)/$$dir'"; \
+              $(MKDIR_P) "$(DESTDIR)$(cfa_includedir)/$$dir"; }; \
+            echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(cfa_includedir)/$$dir'"; \
+            $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(cfa_includedir)/$$dir" || exit $$?; }; \
         done
 
-uninstall-nobase_includeHEADERS:
+uninstall-nobase_cfa_includeHEADERS:
         @$(NORMAL_UNINSTALL)
-        @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
+        @list='$(nobase_cfa_include_HEADERS)'; test -n "$(cfa_includedir)" || list=; \
         $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-        dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
+        dir='$(DESTDIR)$(cfa_includedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -869 +870 @@
 all-am: Makefile $(LIBRARIES) $(HEADERS)
 installdirs:
-        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cfa_includedir)"; do \
           test -z "$$dir" || $(MKDIR_P) "$$dir"; \
         done
@@ -929 +930 @@
 info-am:
 
-install-data-am: install-nobase_includeHEADERS
+install-data-am: install-nobase_cfa_includeHEADERS
 
 install-dvi: install-dvi-am
@@ -975 +976 @@
 ps-am:
 
-uninstall-am: uninstall-libLIBRARIES uninstall-nobase_includeHEADERS
+uninstall-am: uninstall-libLIBRARIES \
+        uninstall-nobase_cfa_includeHEADERS
 
 .MAKE: install-am install-strip
@@ -986 +988 @@
         install-exec-am install-html install-html-am install-info \
         install-info-am install-libLIBRARIES install-man \
-        install-nobase_includeHEADERS install-pdf install-pdf-am \
+        install-nobase_cfa_includeHEADERS install-pdf install-pdf-am \
         install-ps install-ps-am install-strip installcheck \
         installcheck-am installdirs maintainer-clean \
@@ -992 +994 @@
         mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
         tags uninstall uninstall-am uninstall-libLIBRARIES \
-        uninstall-nobase_includeHEADERS
+        uninstall-nobase_cfa_includeHEADERS