You still need Library even when not CY_EXECUTEing.

diff --git a/Makefile.am b/Makefile.am
index 137cc44b6b32aa81a2cef6209ff47b3fe3912504..508c3a5879839fd007aa632a355904bb237de0a7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ lib_LTLIBRARIES += libcycript.la
 libcycript_la_LDFLAGS = $(CY_LDFLAGS)
 libcycript_la_LIBADD = $(LTLIBFFI) -ldl
 
 libcycript_la_LDFLAGS = $(CY_LDFLAGS)
 libcycript_la_LIBADD = $(LTLIBFFI) -ldl
 

-libcycript_la_SOURCES = ConvertUTF.c Driver.cpp Highlight.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp
+libcycript_la_SOURCES = ConvertUTF.c Driver.cpp Highlight.cpp Library.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp

 libcycript_la_SOURCES += Cycript.tab.cc lex.cy.cpp
 
 filters = $(CY_FILTERS)
 libcycript_la_SOURCES += Cycript.tab.cc lex.cy.cpp
 
 filters = $(CY_FILTERS)


@@ -59,7 +59,7 @@ endif
 
 if CY_EXECUTE
 libcycript_la_SOURCES += sig/ffi_type.cpp sig/parse.cpp sig/copy.cpp
 
 if CY_EXECUTE
 libcycript_la_SOURCES += sig/ffi_type.cpp sig/parse.cpp sig/copy.cpp

-libcycript_la_SOURCES += Bridge.cpp Execute.cpp JavaScriptCore.cpp Library.cpp
+libcycript_la_SOURCES += Bridge.cpp Execute.cpp JavaScriptCore.cpp

 libcycript_la_LIBADD += $(LTJAVASCRIPTCORE)
 
 AM_CPPFLAGS += -DCY_EXECUTE
 libcycript_la_LIBADD += $(LTJAVASCRIPTCORE)
 
 AM_CPPFLAGS += -DCY_EXECUTE

diff --git a/Makefile.in b/Makefile.in
index af9bfd6717e20d5d3917fbcb80221c4a88506348..6848b15d6f5f52d5f56fb8a98d65a18d6963cb7b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -102,7 +102,7 @@ host_triplet = @host@
 @CY_CONSOLE_TRUE@bin_PROGRAMS = cycript$(EXEEXT)
 @CY_EXECUTE_TRUE@am__append_2 = sig/ffi_type.cpp sig/parse.cpp \
 @CY_EXECUTE_TRUE@      sig/copy.cpp Bridge.cpp Execute.cpp \
 @CY_CONSOLE_TRUE@bin_PROGRAMS = cycript$(EXEEXT)
 @CY_EXECUTE_TRUE@am__append_2 = sig/ffi_type.cpp sig/parse.cpp \
 @CY_EXECUTE_TRUE@      sig/copy.cpp Bridge.cpp Execute.cpp \

-@CY_EXECUTE_TRUE@      JavaScriptCore.cpp Library.cpp
+@CY_EXECUTE_TRUE@      JavaScriptCore.cpp

 @CY_EXECUTE_TRUE@am__append_3 = $(LTJAVASCRIPTCORE)
 @CY_EXECUTE_TRUE@am__append_4 = -DCY_EXECUTE
 @CY_EXECUTE_TRUE@am__append_5 = C
 @CY_EXECUTE_TRUE@am__append_3 = $(LTJAVASCRIPTCORE)
 @CY_EXECUTE_TRUE@am__append_4 = -DCY_EXECUTE
 @CY_EXECUTE_TRUE@am__append_5 = C


@@ -184,22 +184,23 @@ am__DEPENDENCIES_1 =
 libcycript_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3)
 am__libcycript_la_SOURCES_DIST = ConvertUTF.c Driver.cpp Highlight.cpp \
 libcycript_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3)
 am__libcycript_la_SOURCES_DIST = ConvertUTF.c Driver.cpp Highlight.cpp \

-       Network.cpp Output.cpp Parser.cpp Replace.cpp Cycript.tab.cc \
-       lex.cy.cpp sig/ffi_type.cpp sig/parse.cpp sig/copy.cpp \
-       Bridge.cpp Execute.cpp JavaScriptCore.cpp Library.cpp \
+       Library.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp \
+       Cycript.tab.cc lex.cy.cpp sig/ffi_type.cpp sig/parse.cpp \
+       sig/copy.cpp Bridge.cpp Execute.cpp JavaScriptCore.cpp \

        ObjectiveC/Output.cpp ObjectiveC/Replace.cpp \
        ObjectiveC/Library.mm Handler.mm
 am__dirstamp = $(am__leading_dot)dirstamp
 @CY_EXECUTE_TRUE@am__objects_1 = sig/ffi_type.lo sig/parse.lo \
 @CY_EXECUTE_TRUE@      sig/copy.lo Bridge.lo Execute.lo \
        ObjectiveC/Output.cpp ObjectiveC/Replace.cpp \
        ObjectiveC/Library.mm Handler.mm
 am__dirstamp = $(am__leading_dot)dirstamp
 @CY_EXECUTE_TRUE@am__objects_1 = sig/ffi_type.lo sig/parse.lo \
 @CY_EXECUTE_TRUE@      sig/copy.lo Bridge.lo Execute.lo \

-@CY_EXECUTE_TRUE@      JavaScriptCore.lo Library.lo
+@CY_EXECUTE_TRUE@      JavaScriptCore.lo

 @CY_OBJECTIVEC_TRUE@am__objects_2 = ObjectiveC/Output.lo \
 @CY_OBJECTIVEC_TRUE@   ObjectiveC/Replace.lo \
 @CY_OBJECTIVEC_TRUE@   ObjectiveC/Library.lo
 @CY_MACH_TRUE@am__objects_3 = Handler.lo
 am_libcycript_la_OBJECTS = ConvertUTF.lo Driver.lo Highlight.lo \
 @CY_OBJECTIVEC_TRUE@am__objects_2 = ObjectiveC/Output.lo \
 @CY_OBJECTIVEC_TRUE@   ObjectiveC/Replace.lo \
 @CY_OBJECTIVEC_TRUE@   ObjectiveC/Library.lo
 @CY_MACH_TRUE@am__objects_3 = Handler.lo
 am_libcycript_la_OBJECTS = ConvertUTF.lo Driver.lo Highlight.lo \

-       Network.lo Output.lo Parser.lo Replace.lo Cycript.tab.lo \
-       lex.cy.lo $(am__objects_1) $(am__objects_2) $(am__objects_3)
+       Library.lo Network.lo Output.lo Parser.lo Replace.lo \
+       Cycript.tab.lo lex.cy.lo $(am__objects_1) $(am__objects_2) \
+       $(am__objects_3)

 libcycript_la_OBJECTS = $(am_libcycript_la_OBJECTS)
 libcycript_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) \
 libcycript_la_OBJECTS = $(am_libcycript_la_OBJECTS)
 libcycript_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) \


@@ -547,8 +548,9 @@ libcycript_la_LDFLAGS = $(CY_LDFLAGS)
 libcycript_la_LIBADD = $(LTLIBFFI) -ldl $(am__append_3) \
        $(am__append_9)
 libcycript_la_SOURCES = ConvertUTF.c Driver.cpp Highlight.cpp \
 libcycript_la_LIBADD = $(LTLIBFFI) -ldl $(am__append_3) \
        $(am__append_9)
 libcycript_la_SOURCES = ConvertUTF.c Driver.cpp Highlight.cpp \

-       Network.cpp Output.cpp Parser.cpp Replace.cpp Cycript.tab.cc \
-       lex.cy.cpp $(am__append_2) $(am__append_8) $(am__append_10)
+       Library.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp \
+       Cycript.tab.cc lex.cy.cpp $(am__append_2) $(am__append_8) \
+       $(am__append_10)

 filters = $(CY_FILTERS) $(am__append_5) $(am__append_7)
 @CY_CONSOLE_TRUE@cycript_SOURCES = Console.cpp Display.cpp \
 @CY_CONSOLE_TRUE@      $(am__append_11)
 filters = $(CY_FILTERS) $(am__append_5) $(am__append_7)
 @CY_CONSOLE_TRUE@cycript_SOURCES = Console.cpp Display.cpp \
 @CY_CONSOLE_TRUE@      $(am__append_11)