Changeset 375a068 for src/libcfa

Timestamp:

Dec 14, 2016, 3:31:01 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

74e5a3aa

Parents:

37efaf56

Message:

move builtin/prelude into different directory

Location:

src/libcfa

Files:

• Makefile.am (modified) (4 diffs)
• Makefile.in (modified) (12 diffs)

src/libcfa/Makefile.am ¶

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Fri Aug 26 12:03:37 2016
-## Update Count     : 199
+## Last Modified On : Wed Dec 14 15:17:30 2016
+## Update Count     : 211
 ###############################################################################
 
@@ -28 +28 @@
 endif
 
-# put into lib for now
-cfalibdir = ${libdir}
-cfalib_DATA = builtins.cf extras.cf prelude.cf
-
-# create extra forward types/declarations to reduce inclusion of library files
-extras.cf : extras.regx extras.c
-        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E ${srcdir}/extras.c | grep -f extras.regx > ${srcdir}/extras.cf
-
-# create forward declarations for gcc builtins
-builtins.cf : builtins.c
-        ${AM_V_GEN}if [ -e $< ] ; then \
-                @BACKEND_CC@ -E -P $^ | sed -e "/targetm/s/.*//" -e "/_Decimal/s/.*//" -e "s/void (const char \*)0();//" -e "s/\"//g" -e "s/\(__builtin_\) /\1/" > $@ ; \
-        fi
-
-builtins.c : builtins.def prototypes.awk
-        ${AM_V_GEN}if [ -e $< ] ; then \
-                @BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@ ; \
-        fi
-
-builtins.def :
-
-prototypes.awk :
-
-MAINTAINERCLEANFILES = builtins.cf extras.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
-
-#--------------------------------------------------
-
-libcfa-prelude.c : ${srcdir}/prelude.cf ${srcdir}/extras.cf ${srcdir}/builtins.cf
-        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l ${srcdir}/prelude.cf $@  # use src/cfa-cpp as not in lib until after install
-
 libcfa_a-libcfa-prelude.o : libcfa-prelude.c
          ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -O2 -c -o $@ $<
@@ -64 +34 @@
          ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -D__CFA_DEBUG__ -O0 -c -o $@ $<
 
-EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr       @CFA_FLAGS@
+EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr @CFA_FLAGS@
 
 AM_CCASFLAGS = @CFA_FLAGS@
@@ -77 +47 @@
 % : %.c
         @true
+
+# %.$(OJBEXT) : libcfa-prelude.c
+#       echo "FRED"
+#       @false
+#       ${AM_V_CC} ${abs_top_srcdir}/src/driver/cfa
 
 concurrency/libcfa_a-invoke.o : concurrency/invoke.c

src/libcfa/Makefile.in ¶

@@ -18 +18 @@
 ######################## -*- Mode: Makefile-Automake -*- ######################
 ###############################################################################
-
 
 
@@ -80 +79 @@
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cfalibdir)" \
-        "$(DESTDIR)$(includedir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
 LIBRARIES = $(lib_LIBRARIES)
 AR = ar
@@ -146 +144 @@
 SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
 DIST_SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
-DATA = $(cfalib_DATA)
 HEADERS = $(nobase_include_HEADERS)
 ETAGS = etags
@@ -273 +270 @@
 AUTOMAKE_OPTIONS = subdir-objects
 lib_LIBRARIES = $(am__append_1) $(am__append_2)
-
-# put into lib for now
-cfalibdir = ${libdir}
-cfalib_DATA = builtins.cf extras.cf prelude.cf
-MAINTAINERCLEANFILES = builtins.cf extras.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
-EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr       @CFA_FLAGS@
+EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr @CFA_FLAGS@
 AM_CCASFLAGS = @CFA_FLAGS@
 headers = limits stdlib math iostream fstream iterator rational assert containers/vector concurrency/threads
@@ -769 +761 @@
 @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-cfalibDATA: $(cfalib_DATA)
-        @$(NORMAL_INSTALL)
-        test -z "$(cfalibdir)" || $(MKDIR_P) "$(DESTDIR)$(cfalibdir)"
-        @list='$(cfalib_DATA)'; test -n "$(cfalibdir)" || 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_DATA) $$files '$(DESTDIR)$(cfalibdir)'"; \
-          $(INSTALL_DATA) $$files "$(DESTDIR)$(cfalibdir)" || exit $$?; \
-        done
-
-uninstall-cfalibDATA:
-        @$(NORMAL_UNINSTALL)
-        @list='$(cfalib_DATA)'; test -n "$(cfalibdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        dir='$(DESTDIR)$(cfalibdir)'; $(am__uninstall_files_from_dir)
 install-nobase_includeHEADERS: $(nobase_include_HEADERS)
         @$(NORMAL_INSTALL)
@@ -893 +867 @@
 check-am: all-am
 check: check-am
-all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS)
+all-am: Makefile $(LIBRARIES) $(HEADERS)
 installdirs:
-        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cfalibdir)" "$(DESTDIR)$(includedir)"; do \
+        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
           test -z "$$dir" || $(MKDIR_P) "$$dir"; \
         done
@@ -933 +907 @@
         @echo "This command is intended for maintainers to use"
         @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
@@ -956 +929 @@
 info-am:
 
-install-data-am: install-cfalibDATA install-nobase_includeHEADERS
+install-data-am: install-nobase_includeHEADERS
 
 install-dvi: install-dvi-am
@@ -1002 +975 @@
 ps-am:
 
-uninstall-am: uninstall-cfalibDATA uninstall-libLIBRARIES \
-        uninstall-nobase_includeHEADERS
+uninstall-am: uninstall-libLIBRARIES uninstall-nobase_includeHEADERS
 
 .MAKE: install-am install-strip
@@ -1010 +982 @@
         clean-libLIBRARIES ctags distclean distclean-compile \
         distclean-generic distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-cfalibDATA \
-        install-data install-data-am install-dvi install-dvi-am \
-        install-exec install-exec-am install-html install-html-am \
-        install-info install-info-am install-libLIBRARIES install-man \
+        html-am info info-am install install-am install-data \
+        install-data-am install-dvi install-dvi-am install-exec \
+        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-ps install-ps-am install-strip installcheck \
@@ -1019 +991 @@
         maintainer-clean-generic maintainer-clean-local mostlyclean \
         mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-cfalibDATA \
-        uninstall-libLIBRARIES uninstall-nobase_includeHEADERS
-
-
-# create extra forward types/declarations to reduce inclusion of library files
-extras.cf : extras.regx extras.c
-        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E ${srcdir}/extras.c | grep -f extras.regx > ${srcdir}/extras.cf
-
-# create forward declarations for gcc builtins
-builtins.cf : builtins.c
-        ${AM_V_GEN}if [ -e $< ] ; then \
-                @BACKEND_CC@ -E -P $^ | sed -e "/targetm/s/.*//" -e "/_Decimal/s/.*//" -e "s/void (const char \*)0();//" -e "s/\"//g" -e "s/\(__builtin_\) /\1/" > $@ ; \
-        fi
-
-builtins.c : builtins.def prototypes.awk
-        ${AM_V_GEN}if [ -e $< ] ; then \
-                @BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@ ; \
-        fi
-
-builtins.def :
-
-prototypes.awk :
-
-#--------------------------------------------------
-
-libcfa-prelude.c : ${srcdir}/prelude.cf ${srcdir}/extras.cf ${srcdir}/builtins.cf
-        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l ${srcdir}/prelude.cf $@  # use src/cfa-cpp as not in lib until after install
+        tags uninstall uninstall-am uninstall-libLIBRARIES \
+        uninstall-nobase_includeHEADERS
+
 
 libcfa_a-libcfa-prelude.o : libcfa-prelude.c
@@ -1057 +1005 @@
         @true
 
+# %.$(OJBEXT) : libcfa-prelude.c
+#       echo "FRED"
+#       @false
+#       ${AM_V_CC} ${abs_top_srcdir}/src/driver/cfa
+
 concurrency/libcfa_a-invoke.o : concurrency/invoke.c
         ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $<