Ignore:
Timestamp:
Oct 29, 2019, 4:01:24 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
773db65, 9421f3d8
Parents:
7951100 (diff), 8364209 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 moved

Legend:

Unmodified
Added
Removed

  • libcfa/prelude/Makefile.in

    r7951100 rb067d9b  
    9292build_triplet = @build@
    9393host_triplet = @host@
    94 subdir = src/prelude
     94subdir = prelude
    9595ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    96 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     96am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
     97        $(top_srcdir)/automake/ltoptions.m4 \
     98        $(top_srcdir)/automake/ltsugar.m4 \
     99        $(top_srcdir)/automake/ltversion.m4 \
     100        $(top_srcdir)/automake/lt~obsolete.m4 \
     101        $(top_srcdir)/../automake/cfa.m4 $(top_srcdir)/configure.ac
    97102am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    98103        $(ACLOCAL_M4)
    99104DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
    100105mkinstalldirs = $(install_sh) -d
    101 CONFIG_HEADER = $(top_builddir)/config.h
    102106CONFIG_CLEAN_FILES =
    103107CONFIG_CLEAN_VPATH_FILES =
    … …  
    149153  }
    150154am__installdirs = "$(DESTDIR)$(cfalibdir)"
    151 DATA = $(cfalib_DATA) $(noinst_DATA)
     155DATA = $(cfalib_DATA)
    152156am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    153157am__DIST_COMMON = $(srcdir)/Makefile.in
    154158DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    155159ACLOCAL = @ACLOCAL@
    156 ALLOCA = @ALLOCA@
    157160AMTAR = @AMTAR@
    158161AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
     162AR = @AR@
     163ARCHITECTURE = @ARCHITECTURE@
     164ARCH_FLAGS = @ARCH_FLAGS@
    159165AUTOCONF = @AUTOCONF@
    160166AUTOHEADER = @AUTOHEADER@
    161167AUTOMAKE = @AUTOMAKE@
    162168AWK = @AWK@
    163 BACKEND_CC = @BACKEND_CC@
    164 CC = ${abs_top_srcdir}/src/driver/cfa
     169CC = @LOCAL_CFACC@
    165170CCAS = @CCAS@
    166171CCASDEPMODE = @CCASDEPMODE@
    167172CCASFLAGS = @CCASFLAGS@
    168173CCDEPMODE = @CCDEPMODE@
    169 CFA_BACKEND_CC = @CFA_BACKEND_CC@
     174CFACC = @CFACC@
     175CFACPP = @CFACPP@
     176CFADIR_HASH = @CFADIR_HASH@
    170177CFA_BINDIR = @CFA_BINDIR@
    171 CFA_FLAGS = @CFA_FLAGS@
    172178CFA_INCDIR = @CFA_INCDIR@
    173179CFA_LIBDIR = @CFA_LIBDIR@
    174180CFA_NAME = @CFA_NAME@
    175181CFA_PREFIX = @CFA_PREFIX@
     182CFA_VERSION = @CFA_VERSION@
    176183CFLAGS = @CFLAGS@
     184CONFIGURATION = @CONFIGURATION@
     185CONFIG_BUILDLIB = @CONFIG_BUILDLIB@
     186CONFIG_CFAFLAGS = @CONFIG_CFAFLAGS@
     187CONFIG_CFLAGS = @CONFIG_CFLAGS@
    177188CPP = @CPP@
    178189CPPFLAGS = @CPPFLAGS@
    179190CXX = @CXX@
     191CXXCPP = @CXXCPP@
    180192CXXDEPMODE = @CXXDEPMODE@
    181193CXXFLAGS = @CXXFLAGS@
    … …  
    183195DEFS = @DEFS@
    184196DEPDIR = @DEPDIR@
     197DLLTOOL = @DLLTOOL@
     198DRIVER_DIR = @DRIVER_DIR@
     199DSYMUTIL = @DSYMUTIL@
     200DUMPBIN = @DUMPBIN@
    185201ECHO_C = @ECHO_C@
    186202ECHO_N = @ECHO_N@
    … …  
    188204EGREP = @EGREP@
    189205EXEEXT = @EXEEXT@
     206FGREP = @FGREP@
    190207GREP = @GREP@
    191208INSTALL = @INSTALL@
    … …  
    194211INSTALL_SCRIPT = @INSTALL_SCRIPT@
    195212INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
     213LD = @LD@
    196214LDFLAGS = @LDFLAGS@
    197 LEX = @LEX@
    198 LEXLIB = @LEXLIB@
    199 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
    200215LIBOBJS = @LIBOBJS@
    201216LIBS = @LIBS@
     217LIBTOOL = @LIBTOOL@
     218LIPO = @LIPO@
     219LN_S = @LN_S@
     220LOCAL_CC1 = @LOCAL_CC1@
     221LOCAL_CFACC = @LOCAL_CFACC@
    202222LTLIBOBJS = @LTLIBOBJS@
    203 MACHINE_TYPE = @MACHINE_TYPE@
    204 MAINT = @MAINT@
     223LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    205224MAKEINFO = @MAKEINFO@
     225MANIFEST_TOOL = @MANIFEST_TOOL@
    206226MKDIR_P = @MKDIR_P@
     227NM = @NM@
     228NMEDIT = @NMEDIT@
     229OBJDUMP = @OBJDUMP@
    207230OBJEXT = @OBJEXT@
     231OTOOL = @OTOOL@
     232OTOOL64 = @OTOOL64@
    208233PACKAGE = @PACKAGE@
    209234PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
    … …  
    215240PATH_SEPARATOR = @PATH_SEPARATOR@
    216241RANLIB = @RANLIB@
     242SED = @SED@
    217243SET_MAKE = @SET_MAKE@
    218244SHELL = @SHELL@
    219245STRIP = @STRIP@
    220246VERSION = @VERSION@
    221 YACC = @YACC@
    222 YFLAGS = @YFLAGS@
    223247abs_builddir = @abs_builddir@
    224248abs_srcdir = @abs_srcdir@
    225249abs_top_builddir = @abs_top_builddir@
    226250abs_top_srcdir = @abs_top_srcdir@
     251ac_ct_AR = @ac_ct_AR@
    227252ac_ct_CC = @ac_ct_CC@
    228253ac_ct_CXX = @ac_ct_CXX@
     254ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
    229255am__include = @am__include@
    230256am__leading_dot = @am__leading_dot@
    … …  
    275301
    276302# create object files in directory with source files
    277 AUTOMAKE_OPTIONS = subdir-objects
     303AUTOMAKE_OPTIONS = foreign subdir-objects
     304ACLOCAL_AMFLAGS = -I automake
    278305
    279306# put into lib for now
    280307cfalibdir = ${CFA_LIBDIR}
    281 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
    282 noinst_DATA = ../libcfa/libcfa-prelude.c
    283 MAINTAINERCLEANFILES = gcc-builtins.c gcc-builtins.cf builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
     308cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
     309AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
     310AM_CFAFLAGS = @CONFIG_CFAFLAGS@
     311MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
     312MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
    284313all: all-am
    285314
    286315.SUFFIXES:
    287 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
     316$(srcdir)/Makefile.in: $(srcdir)/Makefile.am  $(am__configure_deps)
    288317        @for dep in $?; do \
    289318          case '$(am__configure_deps)' in \
    … …  
    294323          esac; \
    295324        done; \
    296         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/prelude/Makefile'; \
     325        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign prelude/Makefile'; \
    297326        $(am__cd) $(top_srcdir) && \
    298           $(AUTOMAKE) --foreign src/prelude/Makefile
     327          $(AUTOMAKE) --foreign prelude/Makefile
    299328Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    300329        @case '$?' in \
    … …  
    309338        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    310339
    311 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
     340$(top_srcdir)/configure: $(am__configure_deps)
    312341        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    313 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
     342$(ACLOCAL_M4): $(am__aclocal_m4_deps)
    314343        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    315344$(am__aclocal_m4_deps):
     345
     346mostlyclean-libtool:
     347        -rm -f *.lo
     348
     349clean-libtool:
     350        -rm -rf .libs _libs
    316351install-cfalibDATA: $(cfalib_DATA)
    317352        @$(NORMAL_INSTALL)
    … …  
    399434        fi
    400435mostlyclean-generic:
     436        -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
    401437
    402438clean-generic:
    … …  
    412448clean: clean-am
    413449
    414 clean-am: clean-generic mostlyclean-am
     450clean-am: clean-generic clean-libtool mostlyclean-am
    415451
    416452distclean: distclean-am
    … …  
    465501mostlyclean: mostlyclean-am
    466502
    467 mostlyclean-am: mostlyclean-generic
     503mostlyclean-am: mostlyclean-generic mostlyclean-libtool
    468504
    469505pdf: pdf-am
    … …  
    479515.MAKE: install-am install-strip
    480516
    481 .PHONY: all all-am check check-am clean clean-generic cscopelist-am \
    482         ctags-am distclean distclean-generic distdir dvi dvi-am html \
    483         html-am info info-am install install-am install-cfalibDATA \
    484         install-data install-data-am install-dvi install-dvi-am \
    485         install-exec install-exec-am install-html install-html-am \
    486         install-info install-info-am install-man install-pdf \
    487         install-pdf-am install-ps install-ps-am install-strip \
    488         installcheck installcheck-am installdirs maintainer-clean \
     517.PHONY: all all-am check check-am clean clean-generic clean-libtool \
     518        cscopelist-am ctags-am distclean distclean-generic \
     519        distclean-libtool distdir dvi dvi-am html html-am info info-am \
     520        install install-am install-cfalibDATA install-data \
     521        install-data-am install-dvi install-dvi-am install-exec \
     522        install-exec-am install-html install-html-am install-info \
     523        install-info-am install-man install-pdf install-pdf-am \
     524        install-ps install-ps-am install-strip installcheck \
     525        installcheck-am installdirs maintainer-clean \
    489526        maintainer-clean-generic maintainer-clean-local mostlyclean \
    490         mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
    491         uninstall-am uninstall-cfalibDATA
     527        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     528        tags-am uninstall uninstall-am uninstall-cfalibDATA
    492529
    493530.PRECIOUS: Makefile
    … …  
    501538
    502539# create extra forward types/declarations to reduce inclusion of library files
    503 extras.cf : extras.regx extras.c
    504         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E ${srcdir}/extras.c | grep -f extras.regx > ${srcdir}/extras.cf
     540extras.cf : ${srcdir}/extras.regx ${srcdir}/extras.c
     541        ${AM_V_GEN}gcc ${AM_CFLAGS} -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf
    505542
    506543# create forward declarations for gcc builtins
    507 gcc-builtins.cf : gcc-builtins.c prototypes.sed
    508         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E -P $< | sed -r -f prototypes.sed > $@
    509 
    510 gcc-builtins.c : builtins.def prototypes.awk sync-builtins.cf
    511         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E prototypes.c | awk -f prototypes.awk > $@
     544gcc-builtins.cf : gcc-builtins.c ${srcdir}/prototypes.sed
     545        ${AM_V_GEN}gcc -I${srcdir} -E -P $< | sed -r -f ${srcdir}/prototypes.sed > $@
     546
     547gcc-builtins.c : ${srcdir}/builtins.def ${srcdir}/prototypes.awk ${srcdir}/sync-builtins.cf ${srcdir}/prototypes.c
     548        ${AM_V_GEN}gcc -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@
     549
     550prelude.cfa : prelude-gen.cc
     551        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
     552        @./prelude-gen > $@
     553        @rm ./prelude-gen
    512554
    513555builtins.def :
    … …  
    516558
    517559# create forward declarations for cfa builtins
    518 builtins.cf : builtins.c ${CC}
    519         ${AM_V_GEN}${CC} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
     560builtins.cf : builtins.c @LOCAL_CFACC@
     561        ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po -D__cforall
    520562        ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
    521563
    522564include $(DEPDIR)/builtins.Po
    523565
    524 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
    525         ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    526 
    527 bootloader.c : bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
    528         ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
     566bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     567        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    529568
    530569maintainer-clean-local :
    531570        rm -rf $(DEPDIR)
     571
     572@ENABLE_DISTCC_TRUE@distribution: @LOCAL_CFACC@ @LOCAL_CC1@ @CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
     573@ENABLE_DISTCC_TRUE@    ${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
     574@ENABLE_DISTCC_TRUE@    @echo "Dummy file to track distribution to remote hosts" > ${@}
     575
     576@ENABLE_DISTCC_TRUE@all: all-am distribution
    532577
    533578# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.