[lmi-commits] [lmi] gwc-no-xslfo 4a983d0 01/12: Import makefile changes verbatim from vz-no-xslfo

[Greg Chicares]

branch: gwc-no-xslfo
commit 4a983d0d861478e8e521d23ce44eb3e96471b2cd
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Import makefile changes verbatim from vz-no-xslfo
---
 Makefile.am  | 21 ++++++++++++++++++---
 objects.make | 15 +++++++++++++--
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 441aaa4..1f4fc5a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -110,6 +110,7 @@ TESTS = \
     test_ieee754 \
     test_input_seq \
     test_input \
+    test_interpolate_string \
     test_irc7702a \
     test_istream_to_string \
     test_loads \
@@ -172,6 +173,7 @@ libskeleton_la_SOURCES = \
     illustration_document.cpp \
     illustration_view.cpp \
     input_sequence_entry.cpp \
+    ledger_pdf_generator_wx.cpp \
     main_common.cpp \
     mec_document.cpp \
     mec_view.cpp \
@@ -180,6 +182,7 @@ libskeleton_la_SOURCES = \
     multidimgrid_tools.cpp \
     mvc_controller.cpp \
     mvc_view.cpp \
+    pdf_writer_wx.cpp \
     policy_document.cpp \
     policy_view.cpp \
     preferences_view.cpp \
@@ -316,6 +319,7 @@ liblmi_common_sources = \
     global_settings.cpp \
     group_values.cpp \
     group_quote_pdf_gen.cpp \
+    html.cpp \
     illustrator.cpp \
     input.cpp \
     input_harmonization.cpp \
@@ -325,13 +329,15 @@ liblmi_common_sources = \
     input_sequence_parser.cpp \
     input_xml_io.cpp \
     interest_rates.cpp \
+    interpolate_string.cpp \
     ledger.cpp \
     ledger_base.cpp \
+    ledger_evaluator.cpp \
     ledger_invariant.cpp \
+    ledger_pdf.cpp \
+    ledger_pdf_generator.cpp \
     ledger_text_formats.cpp \
     ledger_variant.cpp \
-    ledger_xml_io.cpp \
-    ledger_xsl.cpp \
     ledgervalues.cpp \
     license.cpp \
     loads.cpp \
@@ -775,6 +781,11 @@ test_input_LDADD = \
   $(BOOST_LIBS) \
   $(XMLWRAPP_LIBS)
 
+test_interpolate_string_SOURCES = \
+  $(common_test_objects) \
+  interpolate_string.cpp \
+  interpolate_string_test.cpp
+
 test_irc7702a_SOURCES = \
   $(common_test_objects) \
   ihs_irc7702a.cpp \
@@ -1150,6 +1161,7 @@ noinst_HEADERS = \
     group_quote_pdf_gen.hpp \
     group_values.hpp \
     handle_exceptions.hpp \
+    html.hpp \
     icon_monger.hpp \
     ieee754.hpp \
     ihs_irc7702.hpp \
@@ -1166,13 +1178,16 @@ noinst_HEADERS = \
     input_sequence_interval.hpp \
     input_sequence_parser.hpp \
     interest_rates.hpp \
+    interpolate_string.hpp \
     istream_to_string.hpp \
     ledger.hpp \
     ledger_base.hpp \
+    ledger_evaluator.hpp \
     ledger_invariant.hpp \
+    ledger_pdf.hpp \
+    ledger_pdf_generator.hpp \
     ledger_text_formats.hpp \
     ledger_variant.hpp \
-    ledger_xsl.hpp \
     ledgervalues.hpp \
     license.hpp \
     lmi.hpp \
diff --git a/objects.make b/objects.make
index 908c45b..01d58a6 100644
--- a/objects.make
+++ b/objects.make
@@ -205,6 +205,7 @@ common_common_objects := \
   global_settings.o \
   group_quote_pdf_gen.o \
   group_values.o \
+  html.o \
   illustrator.o \
   input.o \
   input_harmonization.o \
@@ -214,13 +215,15 @@ common_common_objects := \
   input_sequence_parser.o \
   input_xml_io.o \
   interest_rates.o \
+  interpolate_string.o \
   ledger.o \
   ledger_base.o \
+  ledger_evaluator.o \
   ledger_invariant.o \
+  ledger_pdf.o \
+  ledger_pdf_generator.o \
   ledger_text_formats.o \
   ledger_variant.o \
-  ledger_xml_io.o \
-  ledger_xsl.o \
   ledgervalues.o \
   license.o \
   loads.o \
@@ -322,6 +325,7 @@ skeleton_objects := \
   illustration_document.o \
   illustration_view.o \
   input_sequence_entry.o \
+  ledger_pdf_generator_wx.o \
   main_common.o \
   mec_document.o \
   mec_view.o \
@@ -330,6 +334,7 @@ skeleton_objects := \
   multidimgrid_tools.o \
   mvc_controller.o \
   mvc_view.o \
+  pdf_writer_wx.o \
   policy_document.o \
   policy_view.o \
   preferences_view.o \
@@ -421,6 +426,7 @@ unit_test_targets := \
   ieee754_test \
   input_sequence_test \
   input_test \
+  interpolate_string_test \
   irc7702a_test \
   istream_to_string_test \
   loads_test \
@@ -690,6 +696,11 @@ input_test$(EXEEXT): \
   xml_lmi.o \
   yare_input.o \
 
+interpolate_string_test$(EXEEXT): \
+  $(common_test_objects) \
+  interpolate_string.o \
+  interpolate_string_test.o \
+
 irc7702a_test$(EXEEXT): \
   $(boost_filesystem_objects) \
   $(common_test_objects) \