Changes in src/Makefile.am [10cb642:4e9c7c1]

File:

• src/Makefile.am (modified) (2 diffs)

src/Makefile.am

@@ -10 +10 @@
 ## Author           : Peter A. Buhr
 ## Created On       : Sun May 31 08:51:46 2015
-## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Aug  5 12:57:46 2019
-## Update Count     : 98
+## Last Modified By : Andrew Beach
+## Last Modified On : Tus Jul 25 10:34:00 2017
+## Update Count     : 76
 ###############################################################################
 
 # create object files in directory with source files
-AUTOMAKE_OPTIONS = foreign subdir-objects
-ACLOCAL_AMFLAGS  = -I automake
+AUTOMAKE_OPTIONS = subdir-objects
 
 SRC = main.cc \
-      MakeLibCfa.cc \
-      CompilationState.cc
-
-SRCDEMANGLE = CompilationState.cc
+      MakeLibCfa.cc
 
 MAINTAINERCLEANFILES =
-MOSTLYCLEANFILES =
 
-if WITH_LIBPROFILER
-LIBPROFILER = -lprofiler
-endif
+# Is there a way to use a variable for the directory names?
 
-if WITH_LIBTCMALLOC
-LIBTCMALLOC = -ltcmalloc
-TCMALLOCFLAG = -DTCMALLOC
-endif
-
-include AST/module.mk
 include CodeGen/module.mk
 include CodeTools/module.mk
@@ -50 +37 @@
 include SynTree/module.mk
 include Tuples/module.mk
-include Validate/module.mk
 include Virtual/module.mk
 
-$(addprefix $(srcdir)/, ResolvExpr/ConversionCost.cc ResolvExpr/CommonType.cc SymTab/ManglerCommon.cc) : $(srcdir)/SynTree/Type.h
-
-$(srcdir)/AST/Type.hpp : BasicTypes-gen.cc
-        ${AM_V_GEN}${CXXCOMPILE} $< -o BasicTypes-gen -Wall -Wextra
-        @./BasicTypes-gen
-        @rm BasicTypes-gen
-
 # put into lib for now
-cfa_cpplibdir = $(CFA_LIBDIR)
-cfa_cpplib_PROGRAMS = ../driver/cfa-cpp $(DEMANGLER)
-EXTRA_PROGRAMS = demangler
-___driver_cfa_cpp_SOURCES = $(SRC)
-___driver_cfa_cpp_LDADD = -ldl $(LIBPROFILER) $(LIBTCMALLOC)
-
-AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O3 -g -std=c++14 $(TCMALLOCFLAG)
-AM_LDFLAGS  = @HOST_FLAGS@ -Xlinker -export-dynamic
-ARFLAGS     = cr
-
-demangler_SOURCES = SymTab/demangler.cc # test driver for the demangler, also useful as a sanity check that libdemangle.a is complete
-
-demangler_LDADD = libdemangle.a -ldl                    # yywrap
-
-noinst_LIBRARIES = $(LIBDEMANGLE)
-EXTRA_LIBRARIES = libdemangle.a
-libdemangle_a_SOURCES = $(SRCDEMANGLE)
+cfa_cpplibdir = ${CFA_LIBDIR}
+cfa_cpplib_PROGRAMS = driver/cfa-cpp
+driver_cfa_cpp_SOURCES = ${SRC}
+driver_cfa_cpp_LDADD = -ldl                     # yywrap
+driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
+driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
 
 MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}