Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/vis15/configure.ac
ViewVC logotype

Diff of /branches/vis15/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3340, Wed Oct 21 22:04:01 2015 UTC revision 3348, Tue Oct 27 15:13:58 2015 UTC
# Line 538  Line 538 
538    
539  AH_TOP([  AH_TOP([
540  /*  /*
541   * COPYRIGHT (c) 2014 Diderot project. (http://diderot-language.cs.uchicago.edu)   * This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)
542   * All rights reserved.   *
543     * COPYRIGHT (c) 2015 The University of Chicago * All rights reserved.
544   */   */
545    
546  #ifndef _DIDEROT_CONFIG_H_  #ifndef _DIDEROT_CONFIG_H_
# Line 565  Line 566 
566  dnl  dnl
567  dnl ***** Makefiles *****  dnl ***** Makefiles *****
568    Makefile    Makefile
569    doc/Makefile  dnl  doc/Makefile
570    doc/man/Makefile  dnl  doc/man/Makefile
571    src/clinfo/Makefile  dnl  src/clinfo/Makefile
572    src/compiler/Makefile  dnl  src/compiler/Makefile
573    src/lib/build/Makefile  dnl  src/lib/build/Makefile
574    src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in  dnl  src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in
575    test/MIP/Makefile  dnl  test/MIP/Makefile
576    test/probe/Makefile  dnl  test/probe/Makefile
577    test/iso2d-polyline/Makefile  dnl  test/iso2d-polyline/Makefile
578    test/vr-lite-cam/Makefile  dnl  test/vr-lite-cam/Makefile
579    test/hlic/Makefile  dnl  test/hlic/Makefile
580  dnl  dnl
581  dnl ***** SML source files *****  dnl ***** SML source files *****
582    src/compiler/nrrd/run-dnorm.sml:src/compiler/nrrd/run-dnorm_sml.in  dnl  src/compiler/nrrd/run-dnorm.sml:src/compiler/nrrd/run-dnorm_sml.in
583    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in
584    src/compiler/common/size-of.sml:src/compiler/common/size-of_sml.in    src/compiler/common/size-of.sml:src/compiler/common/size-of_sml.in
585  )  )
# Line 591  Line 592 
592  AC_CONFIG_FILES([  AC_CONFIG_FILES([
593    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in
594  ], [chmod +x bin/install-sml-wrapper.sh])  ], [chmod +x bin/install-sml-wrapper.sh])
595  AC_CONFIG_FILES([  # AC_CONFIG_FILES([
596    src/compiler/gen/file2str/file2str.sh:src/compiler/gen/file2str/file2str_sh.in  #   src/compiler/gen/file2str/file2str.sh:src/compiler/gen/file2str/file2str_sh.in
597  ], [chmod +x src/compiler/gen/file2str/file2str.sh])  # ], [chmod +x src/compiler/gen/file2str/file2str.sh])
598  AC_CONFIG_FILES([  # AC_CONFIG_FILES([
599    rtest/scripts/run.sh:rtest/scripts/run_sh.in  #   rtest/scripts/run.sh:rtest/scripts/run_sh.in
600  ], [chmod +x rtest/scripts/run.sh])  # ], [chmod +x rtest/scripts/run.sh])
601  AC_CONFIG_FILES([  # AC_CONFIG_FILES([
602    rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in  #   rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in
603  ], [chmod +x rtest/scripts/run-one.sh])  # ], [chmod +x rtest/scripts/run-one.sh])
604  #  #
605  # more regression tests; should merge with rtest at some point  # more regression tests; should merge with rtest at some point
606  #  #
607  AC_CONFIG_FILES([  # AC_CONFIG_FILES([
608    rtest2/scripts/run.sh:rtest2/scripts/run_sh.in  #   rtest2/scripts/run.sh:rtest2/scripts/run_sh.in
609  ], [chmod +x rtest2/scripts/run.sh])  # ], [chmod +x rtest2/scripts/run.sh])
610  AC_CONFIG_FILES([  # AC_CONFIG_FILES([
611    rtest2/scripts/run-one.sh:rtest2/scripts/run-one_sh.in  #   rtest2/scripts/run-one.sh:rtest2/scripts/run-one_sh.in
612  ], [chmod +x rtest2/scripts/run-one.sh])  # ], [chmod +x rtest2/scripts/run-one.sh])
613    
614  dnl  dnl
615  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
# Line 627  Line 628 
628      AC_CONFIG_FILES(src/lib/build/$1/Makefile)      AC_CONFIG_FILES(src/lib/build/$1/Makefile)
629    ])    ])
630    
631  MK_BUILD_DIR(rt-c-f, c, [float])  #MK_BUILD_DIR(rt-c-f, c, [float])
632  MK_BUILD_DIR(rt-c-d, c, [double])  #MK_BUILD_DIR(rt-c-d, c, [double])
633  MK_BUILD_DIR(rt-c-f-debug, c, [float debug])  #MK_BUILD_DIR(rt-c-f-debug, c, [float debug])
634  MK_BUILD_DIR(rt-c-d-debug, c, [double debug])  #MK_BUILD_DIR(rt-c-d-debug, c, [double debug])
635  MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])  #MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])
636  MK_BUILD_DIR(rt-c-d-par, parallel, [parallel double])  #MK_BUILD_DIR(rt-c-d-par, parallel, [parallel double])
637  MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])  #MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])
638  MK_BUILD_DIR(rt-c-d-par-debug, parallel, [parallel double debug])  #MK_BUILD_DIR(rt-c-d-par-debug, parallel, [parallel double debug])
639    
640  if test x"$CL_ENABLED" = xtrue ; then  #if test x"$CL_ENABLED" = xtrue ; then
641    MK_BUILD_DIR(rt-cl-f, cl, [float])  #  MK_BUILD_DIR(rt-cl-f, cl, [float])
642    MK_BUILD_DIR(rt-cl-d, cl, [double])  #  MK_BUILD_DIR(rt-cl-d, cl, [double])
643    MK_BUILD_DIR(rt-cl-f-debug, cl, [float debug])  #  MK_BUILD_DIR(rt-cl-f-debug, cl, [float debug])
644    MK_BUILD_DIR(rt-cl-d-debug, cl, [double debug])  #  MK_BUILD_DIR(rt-cl-d-debug, cl, [double debug])
645  fi  #fi
646    
647  AC_OUTPUT  AC_OUTPUT

Legend:
Removed from v.3340  
changed lines
  Added in v.3348

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0