[Themis-devcvs] SF.net SVN: themis:[727] trunk/themis/makefile

[CVS C. to T. <the...@li...>]

Revision: 727
          http://sourceforge.net/p/themis/code/727
Author:   mark_hellegers
Date:     2015-06-07 00:06:48 +0000 (Sun, 07 Jun 2015)
Log Message:
-----------
Moving table files to common caused a crash in the css viewer addon on BeOS, while it worked fine on Haiku.
Left files in common, but explicitly compiling code from those files in css viewer addon.
Might be a compiler issue...

Modified Paths:
--------------
    trunk/themis/makefile

Modified: trunk/themis/makefile
===================================================================
--- trunk/themis/makefile	2015-06-06 22:09:56 UTC (rev 726)
+++ trunk/themis/makefile	2015-06-07 00:06:48 UTC (rev 727)
@@ -756,9 +756,9 @@
 
 #cssviewer add-on
 cssvaddon: framework $(BASE_ADDON_INSTALL_DIR)css_viewer.so domlib
-$(BASE_ADDON_INSTALL_DIR)css_viewer.so: $(BASE_INSTALL_DIR)Themis $(foreach file,$(CSSVIEWERSOURCES),$(BASE_ADDONS_OBJECT_DIR)CSSViewer/$(notdir $(file:.cpp=.o)))
+$(BASE_ADDON_INSTALL_DIR)css_viewer.so: $(BASE_INSTALL_DIR)Themis $(foreach file,$(CSSVIEWERSOURCES),$(BASE_ADDONS_OBJECT_DIR)CSSViewer/$(notdir $(file:.cpp=.o))) common/ColorTools.cpp common/ColumnListView.cpp common/ColumnTypes.cpp
 	@echo "Linking CSS Viewer add-on" 
-	@$(CC) -o$(BASE_ADDON_INSTALL_DIR)css_viewer.so $(foreach file,$(notdir $(CSSVIEWERSOURCES:.cpp=.o)),$(BASE_ADDONS_OBJECT_DIR)CSSViewer/$(file)) -nostart -Xlinker $(LDFLAGS) -soname=css_viewer.so -L ./ -L$(BASE_APP_LIB_INSTALL_DIR)  -lbe -lroot -ldomstyle -ldom -lstdc++.r4 _APP_
+	@$(CC) -o$(BASE_ADDON_INSTALL_DIR)css_viewer.so $(foreach file,$(notdir $(CSSVIEWERSOURCES:.cpp=.o)),$(BASE_ADDONS_OBJECT_DIR)CSSViewer/$(file)) $(COMMON_OBJECT_DIR)ColorTools.o $(COMMON_OBJECT_DIR)ColumnListView.o $(COMMON_OBJECT_DIR)ColumnTypes.o -nostart -Xlinker $(LDFLAGS) -soname=css_viewer.so -L ./ -L$(BASE_APP_LIB_INSTALL_DIR)  -lbe -lroot -ldomstyle -ldom -lstdc++.r4 _APP_
 	@echo "CSS Viewer add-on is now linked. Doing mimeset."
 	@mimeset -F $(BASE_ADDON_INSTALL_DIR)css_viewer.so
 	@echo "CSS Viewer plug-in compiled and linked successfully."

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.