# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1344171870 14400
# Node ID 03381a36f70d2a786b619460e4614d1a722e2ee3
# Parent  d29f2583cf7b5c3a3d9c5d0f2ffe16eaeb52ff45
generate convenience libraries for new parse-tree and interpfcn subdirectories

* src/Makefile.am (liboctinterp_la_SOURCES): Include octave.cc in the
list, not $(DIST_SRC).
(liboctinterp_la_LIBADD): Include octave-value/liboctave-value.la,
parse-tree/libparse-tree.la, interp-core/libinterp-core.la,
interpfcn/libinterpfcn.la, and corefcn/libcorefcn.la in the list.
* src/interp-core/module.mk (noinst_LTLIBRARIES): Add
interp-core/libinterp-core.la to the list.
(interp_core_libinterp_core_la_SOURCES): New variable.
* src/interpfcn/module.mk (noinst_LTLIBRARIES): Add
interpfcn/libinterpfcn.la to the list.
(interpfcn_libinterpfcn_la_SOURCES): New variable.
* src/parse-tree/module.mk (noinst_LTLIBRARIES): Add
parse-tree/libparse-tree.la to the list.
(parse_tree_libparse_tree_la_SOURCES): New variable.
* src/octave-value/module.mk (noinst_LTLIBRARIES): Add
octave-value/liboctave-value.la to the list.
(octave_value_liboctave_value_la_SOURCES): New variable.

diff -r d29f2583cf7b -r 03381a36f70d src/Makefile.am
--- a/src/Makefile.am	Sat Aug 04 00:19:07 2012 -0500
+++ b/src/Makefile.am	Sun Aug 05 09:04:30 2012 -0400
@@ -172,7 +172,7 @@
 endif
 
 liboctinterp_la_SOURCES = \
-  $(DIST_SRC) \
+  octave.cc \
   $(OPERATORS_SRC) \
   $(TEMPLATE_INST_SRC)
 
@@ -192,6 +192,11 @@
 include link-deps.mk
 
 liboctinterp_la_LIBADD = \
+  octave-value/liboctave-value.la \
+  parse-tree/libparse-tree.la \
+  interp-core/libinterp-core.la \
+  interpfcn/libinterpfcn.la \
+  corefcn/libcorefcn.la \
   ../liboctave/liboctave.la \
   ../libcruft/libcruft.la \
   $(LIBOCTINTERP_LINK_DEPS)
diff -r d29f2583cf7b -r 03381a36f70d src/interp-core/module.mk
--- a/src/interp-core/module.mk	Sat Aug 04 00:19:07 2012 -0500
+++ b/src/interp-core/module.mk	Sun Aug 05 09:04:30 2012 -0400
@@ -57,7 +57,7 @@
   interp-core/xnorm.h \
   interp-core/xpow.h \
   interp-core/zfstream.h \
-	$(JIT_INCLUDES)
+  $(JIT_INCLUDES)
 
 JIT_SRC = \
   interp-core/jit-util.cc \
@@ -107,7 +107,7 @@
   interp-core/xpow.cc \
   interp-core/zfstream.cc \
   $(JIT_SRC) \
-	$(C_INTERP_CORE_SRC)
+  $(C_INTERP_CORE_SRC)
 
 ## FIXME: I don't believe this rule actually fires
 display.df display.lo: CPPFLAGS += $(X11_FLAGS)
@@ -129,3 +129,6 @@
 	  -e "s|%OCTAVE_IDX_TYPE%|${OCTAVE_IDX_TYPE}|" > $@-t
 	mv $@-t $@
 
+noinst_LTLIBRARIES += interp-core/libinterp-core.la
+
+interp_core_libinterp_core_la_SOURCES = $(INTERP_CORE_SRC)
diff -r d29f2583cf7b -r 03381a36f70d src/interpfcn/module.mk
--- a/src/interpfcn/module.mk	Sat Aug 04 00:19:07 2012 -0500
+++ b/src/interpfcn/module.mk	Sun Aug 05 09:04:30 2012 -0400
@@ -71,3 +71,7 @@
 
 __init_fltk__.lo __init_fltk__.o: \
   AM_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(AM_CXXFLAGS) $(GRAPHICS_CFLAGS))
+
+noinst_LTLIBRARIES += interpfcn/libinterpfcn.la
+
+interpfcn_libinterpfcn_la_SOURCES = $(INTERPFCN_SRC)
diff -r d29f2583cf7b -r 03381a36f70d src/octave-value/module.mk
--- a/src/octave-value/module.mk	Sat Aug 04 00:19:07 2012 -0500
+++ b/src/octave-value/module.mk	Sun Aug 05 09:04:30 2012 -0400
@@ -124,3 +124,6 @@
   $(OV_INTTYPE_SRC) \
   $(OV_SPARSE_SRC)
 
+noinst_LTLIBRARIES += octave-value/liboctave-value.la
+
+octave_value_liboctave_value_la_SOURCES = $(OCTAVE_VALUE_SRC)
diff -r d29f2583cf7b -r 03381a36f70d src/parse-tree/module.mk
--- a/src/parse-tree/module.mk	Sat Aug 04 00:19:07 2012 -0500
+++ b/src/parse-tree/module.mk	Sun Aug 05 09:04:30 2012 -0400
@@ -44,7 +44,7 @@
   parse-tree/pt-walk.h \
   parse-tree/pt.h \
   parse-tree/token.h \
-	$(PARSER_INCLUDES)
+  $(PARSER_INCLUDES)
 
 PARSE_TREE_SRC = \
   parse-tree/pt-arg-list.cc \
@@ -74,7 +74,7 @@
   parse-tree/pt-unop.cc \
   parse-tree/pt.cc \
   parse-tree/token.cc \
-	$(PARSER_SRC)
+  $(PARSER_SRC)
 
 ## Special rules for sources which must be built before rest of compilation.
 
@@ -88,3 +88,6 @@
 	mv $@-t $@
 	rm -f $@-t1
 
+noinst_LTLIBRARIES += parse-tree/libparse-tree.la
+
+parse_tree_libparse_tree_la_SOURCES = $(PARSE_TREE_SRC)