Changeset 76f2e97f


Ignore:
Timestamp:
May 21, 2015, 10:05:22 PM (7 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, string, with_gc
Children:
451665cc
Parents:
843054c2
Message:

change directory name translator to src

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    r843054c2 r76f2e97f  
    1 SUBDIRS = translator driver libcfa
     1SUBDIRS = driver libcfa src
    22
    33# non-source files
  • Makefile.in

    r843054c2 r76f2e97f  
    3636        $(srcdir)/Makefile.in $(srcdir)/config.h.in \
    3737        $(top_srcdir)/configure $(top_srcdir)/driver/Makefile.in \
    38         $(top_srcdir)/libcfa/Makefile.in \
    39         $(top_srcdir)/translator/Makefile.in \
    40         $(top_srcdir)/translator/examples/Makefile.in AUTHORS INSTALL \
    41         TODO install-sh missing mkinstalldirs
     38        $(top_srcdir)/libcfa/Makefile.in $(top_srcdir)/src/Makefile.in \
     39        $(top_srcdir)/src/examples/Makefile.in AUTHORS INSTALL TODO \
     40        install-sh missing mkinstalldirs
    4241ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    4342am__aclocal_m4_deps = $(top_srcdir)/configure.in
     
    4847mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
    4948CONFIG_HEADER = config.h
    50 CONFIG_CLEAN_FILES = translator/Makefile driver/Makefile \
    51         libcfa/Makefile translator/examples/Makefile
     49CONFIG_CLEAN_FILES = src/Makefile driver/Makefile libcfa/Makefile \
     50        src/examples/Makefile
    5251CONFIG_CLEAN_VPATH_FILES =
    5352SOURCES =
     
    211210top_builddir = @top_builddir@
    212211top_srcdir = @top_srcdir@
    213 SUBDIRS = translator driver libcfa
     212SUBDIRS = driver libcfa src
    214213
    215214# non-source files
     
    268267distclean-hdr:
    269268        -rm -f config.h stamp-h1
    270 translator/Makefile: $(top_builddir)/config.status $(top_srcdir)/translator/Makefile.in
     269src/Makefile: $(top_builddir)/config.status $(top_srcdir)/src/Makefile.in
    271270        cd $(top_builddir) && $(SHELL) ./config.status $@
    272271driver/Makefile: $(top_builddir)/config.status $(top_srcdir)/driver/Makefile.in
     
    274273libcfa/Makefile: $(top_builddir)/config.status $(top_srcdir)/libcfa/Makefile.in
    275274        cd $(top_builddir) && $(SHELL) ./config.status $@
    276 translator/examples/Makefile: $(top_builddir)/config.status $(top_srcdir)/translator/examples/Makefile.in
     275src/examples/Makefile: $(top_builddir)/config.status $(top_srcdir)/src/examples/Makefile.in
    277276        cd $(top_builddir) && $(SHELL) ./config.status $@
    278277
  • configure

    r843054c2 r76f2e97f  
    566566PACKAGE_URL=''
    567567
    568 ac_unique_file="translator/main.cc"
     568ac_unique_file="src/main.cc"
    569569# Factoring default headers for most tests.
    570570ac_includes_default="\
     
    50005000
    50015001
    5002 ac_config_files="$ac_config_files Makefile translator/Makefile driver/Makefile libcfa/Makefile translator/examples/Makefile"
     5002ac_config_files="$ac_config_files Makefile src/Makefile driver/Makefile libcfa/Makefile src/examples/Makefile"
    50035003
    50045004cat >confcache <<\_ACEOF
     
    57385738    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    57395739    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    5740     "translator/Makefile") CONFIG_FILES="$CONFIG_FILES translator/Makefile" ;;
     5740    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
    57415741    "driver/Makefile") CONFIG_FILES="$CONFIG_FILES driver/Makefile" ;;
    57425742    "libcfa/Makefile") CONFIG_FILES="$CONFIG_FILES libcfa/Makefile" ;;
    5743     "translator/examples/Makefile") CONFIG_FILES="$CONFIG_FILES translator/examples/Makefile" ;;
     5743    "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
    57445744
    57455745  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  • configure.in

    r843054c2 r76f2e97f  
    11AC_INIT(cfa-cc, 1.0, cforall@plg.uwaterloo.ca)
    2 AC_CONFIG_SRCDIR([translator/main.cc])
     2AC_CONFIG_SRCDIR([src/main.cc])
    33
    44AM_INIT_AUTOMAKE([foreign])             # do not follow GNU standard
     
    101101AC_SUBST(CFA_LIBDIR)
    102102
    103 AC_OUTPUT([ Makefile translator/Makefile driver/Makefile libcfa/Makefile translator/examples/Makefile ])
     103AC_OUTPUT([ Makefile src/Makefile driver/Makefile libcfa/Makefile src/examples/Makefile ])
    104104
    105105dnl Final text
  • libcfa/Makefile.in

    r843054c2 r76f2e97f  
    1111## Created On       : Sat May 16 08:05:18 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Sat May 16 08:06:05 2015
    14 ## Update Count     : 1
     13## Last Modified On : Thu May 21 22:00:51 2015
     14## Update Count     : 3
    1515###############################################################################
    1616
    1717INSTALL=@INSTALL@
    1818BACKEND_CC := @BACKEND_CC@
     19CFA_LIBDIR = @CFA_LIBDIR@
    1920
    2021LIBRARIES := libcfa.a builtins.cf builtins.c
     
    3536        ${INSTALL} builtins.cf @CFA_LIBDIR@
    3637
    37 libcfa-prelude.c: ../translator/cfa-cpp prelude.cf builtins.cf
     38libcfa-prelude.c: @CFA_LIBDIR@/cfa-cpp prelude.cf builtins.cf
    3839        sed -i -e "s#typedef.*ptrdiff_t.*#`@BACKEND_CC@ -E ptrdiff_t.c | grep 'typedef.*ptrdiff_t'`#" prelude.cf
    39         ../translator/cfa-cpp -l prelude.cf $@
     40        @CFA_LIBDIR@/cfa-cpp -l prelude.cf $@
    4041        rm -f prelude.c
    4142
Note: See TracChangeset for help on using the changeset viewer.