Refactored code into a separate libflumap library so that it can be

shared between the command line binary and the web browser plugin.

1 files changed, 12 insertions, 9 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 82ddc3b..cf16798 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,19 @@
+# Driver
+
 bin_PROGRAMS = flumap
+flumap_SOURCES = flumap.c
+flumap_LDADD = ${GLUT_LIBS} libflumap.la
 
-lib_LTLIBRARIES = libflumapplugin.la
+# Web Browser Plugin
 
+lib_LTLIBRARIES = libflumapplugin.la libflumap.la
 libflumapplugin_la_CFLAGS = -I/usr/include/xulrunner-1.9/unstable
+libflumapplugin_la_SOURCES = plugin/plugin.c
+libflumapplugin_la_LIBADD = ${GLUT_LIBS} libflumap.la
 
-libflumapplugin_la_SOURCES = \
-	plugin/plugin.c \
-	plugin/plugin.h
+# Engine
 
-flumap_SOURCES = \
+libflumap_la_SOURCES = \
 	controller/actions/clear_selection.c \
 	controller/actions/pan.c \
 	controller/actions/process_hits.c \
@@ -23,7 +28,6 @@ flumap_SOURCES = \
 	controller/callbacks/mouse_wheel.c \
 	controller/callbacks/reshape.c \
 	db/dbconnect.c \
-	flumap.c \
 	model/data/base.c \
 	model/geometry/datarose_geometry.c \
 	model/geometry/density_legend_geometry.c \
@@ -41,8 +45,6 @@ flumap_SOURCES = \
 	view/init.c \
 	view/view.c
 
-flumap_LDADD = ${GLUT_LIBS}
-
 noinst_HEADERS = \
 	controller/actions/clear_selection.h \
 	controller/actions/pan.h \
@@ -73,6 +75,7 @@ noinst_HEADERS = \
 	model/state/state.h \
 	model/state/zoom_info.h \
 	model/state/zoom_info_init.h \
+	plugin/plugin.h \
 	util/ati_meminfo.h \
 	util/check_error.h \
 	util/pick_convert.h \
@@ -89,7 +92,7 @@ noinst_HEADERS = \
 # 	util/amd_performance_monitor/ati_counter_info.h
 #	util/amd_performance_monitor/ati_get_group_and_counter_list.h
 
-AM_CFLAGS = -Wall -ggdb -std=gnu99 -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -I/usr/include/ncbi
+AM_CFLAGS = -Wall -ggdb -std=gnu99 -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
 
 # DB2 Precompiler for Embedded SQL
 %.c : %.sqc