fix up foocanvas and AceConn make stuff

src/zmapApp/makefile

@@ -55,9 +55,8 @@ include $(MAKE_DIR)/common.targets
 # ZMAP library...
 ZMAP_LIB_FLAGS = -L$(BINDIR) -lZMapApp -lZMap -lZMapThr
 
-# Ace-Conn library...This is a bit of hack really...the ACEDB_MACHINE stuff should be
-# in a separate subdir as we don't yet know what server we will be contacting....
-ACECONN_DIR = $(HOME)/acedb/CODE/Ace-Conn
+# Ace-Conn library used for interfacing to the acedb socket server.
+ACECONN_DIR = /nfs/disk100/acedb/Ace-Conn
 ACECONN_INCL_DIR = $(ACECONN_DIR)
 ACECONN_LIB_DIR = $(ACECONN_DIR)/bin.$(ACEDB_MACHINE)
 ACECONN_LIB_FLAGS = -L$(ACECONN_LIB_DIR) -lAceConn -lmd5

src/zmapMake/common.defs

@@ -15,6 +15,12 @@
 #
 
 
+# lots of open source software uses pkg-config, this is the stuff we need:
+PACKAGE_CONFIG = 
+PACKAGE_PATH = 
+FOO_CANVAS_PATH = /nfs/disk100/acedb/foocanvas-ins/$(ZMAP_PLATFORM)
+
+
 
 #
 # Include platform specific macros.
@@ -70,16 +76,18 @@ ZMAPNOTHR_LIB = $(BINDIR)/$(ZMAPNOTHR_LIBNAME)
 #
 ZMAP_INCLUDE = $(ROOT_DIRECTORY)/include
 
-GTK_INC = `$(PACKAGE_PATH) $(PACKAGE_CONFIG) --cflags gtk+-2.0 glib-2.0`
+
+
+GTK_INC = `$(PACKAGE_PATH) $(PACKAGE_CONFIG) --cflags libfoocanvas gtk+-2.0 glib-2.0`
 #CANVAS_INC = `$(PACKAGE_CONFIG) --cflags libgnomecanvas-2.0`
-CANVAS_INC = `$(PACKAGE_PATH) $(PACKAGE_CONFIG) --cflags libfoocanvas`
+#CANVAS_INC = `$(PACKAGE_PATH) $(PACKAGE_CONFIG) --cflags libfoocanvas`
 
 
-INCLUDE_DIRS = $(CANVAS_INC) $(GTK_INC) -I$(ZMAP_INCLUDE) -I. $(CURRENT_INC)
+INCLUDE_DIRS = $(GTK_INC) -I$(ZMAP_INCLUDE) -I. $(CURRENT_INC)
 
-GTK_LIBS = `$(PACKAGE_PATH) $(PACKAGE_CONFIG) --libs gtk+-2.0 gthread-2.0 glib-2.0`
+GTK_LIBS = `$(PACKAGE_PATH) $(PACKAGE_CONFIG) --libs libfoocanvas gtk+-2.0 gthread-2.0 glib-2.0`
 #CANVAS_LIBS = `$(PACKAGE_CONFIG) --libs libgnomecanvas-2.0`
-CANVAS_LIBS = `$(PACKAGE_PATH) $(PACKAGE_CONFIG) --libs libfoocanvas`
+#CANVAS_LIBS = `$(PACKAGE_PATH) $(PACKAGE_CONFIG) --libs libfoocanvas`
 
 
 
@@ -88,7 +96,7 @@ CURL_LIBS = `curl-config --libs`
 EXPAT_LIBS = -lexpat
 
 
-ALL_LIBS = $(ZMAP_LIB_FLAGS) $(ACECONN_LIB_FLAGS) $(FOO_LIBS) $(GNOME_LIBS) $(GTK_LIBS) $(CURL_LIBS) $(EXPAT_LIBS) 
+ALL_LIBS = $(ZMAP_LIB_FLAGS) $(ACECONN_LIB_FLAGS) $(GTK_LIBS) $(CURL_LIBS) $(EXPAT_LIBS) 
 
 
 #

src/zmapMake/platform.alpha_5

@@ -16,22 +16,18 @@ CCC = cxx
 CCFLAGS = -x cxx $(CC_COMMON)
 
 
-# Set the posix alpha make, the normal one does _not_ support .c.a rules correctly.
-#MAKE = /usr/bin/posix/make
+# Use gmake, both the normal alpha make and the posix version (/usr/bin/posix/make) do not support
+# VPATH and other stuff properly.
 MAKE = gmake
 
 TEST = /bin/test
 
-#PACKAGE_CONFIG = /nfs/disk100/acedb/gtk2/bin/pkg-config
 PACKAGE_CONFIG = /nfs/disk100/acedb/gtk2ins-canvas/bin/pkg-config
+PACKAGE_PATH = PKG_CONFIG_PATH=$(FOO_CANVAS_PATH)/lib/pkgconfig:/nfs/disk100/acedb/gtk2ins-canvas/lib/pkgconfig
 
-GNOME_CONFIG = $(PACKAGE_CONFIG)
-#GNOME_CONFIG = 
+# Alpha loader needs this so it can find libraries that are not in the standard places.
+LDFLAGS = -rpath '$(FOO_CANVAS_PATH)/lib:/nfs/disk100/acedb/gtk2ins-canvas/lib'
 
 
-#LDFLAGS = -rpath '/nfs/disk100/acedb/gtk2/lib'
-LDFLAGS = -rpath '/nfs/disk100/acedb/gtk2ins-canvas/lib'
-
-
-# Need to make sure we get a threaded build version of the socket server stuff....
+# Need to make sure we get a threaded build version of the socket server interface library....
 ACEDB_MACHINE = ALPHA_5_THR

src/zmapMake/platform.linux_4

@@ -21,7 +21,14 @@ MAKE = make
 TEST = /usr/bin/test
 
 PACKAGE_CONFIG = pkg-config
-PACKAGE_PATH = PKG_CONFIG_PATH=/nfs/disk100/acedb/foocanvas-ins/linux/lib/pkgconfig
+PACKAGE_PATH = PKG_CONFIG_PATH=$(FOO_CANVAS_PATH)/lib/pkgconfig
+
+# loader needs this so it can find libraries that are not in the standard places, note
+# the arcane way you have to pass linker options through the gcc compiler...sigh...
+LDFLAGS = -Xlinker -rpath -Xlinker $(FOO_CANVAS_PATH)/lib
+
+
+# Need to make sure we get a threaded build version of the socket server interface library....
+ACEDB_MACHINE = LINUX_4_THR
 
-GNOME_CONFIG = $(PACKAGE_CONFIG)