Incorporation of libpfetch and libcurlobject

New files.... bootstrap....

src/Makefile.am

@@ -54,7 +54,9 @@ zmap_SOURCES = $(top_srcdir)/zmapApp/zmapApp_P.h
 #	$(NULL) 
 
 # -lZMap was at the end, why is this?
-zmap_LDFLAGS = -L$(top_builddir)/lib -lZMapApp -lZMap -lZMapThr -lZMap -lZMapXML -lexpat -lpopt -lg2 -lgd \
+zmap_LDFLAGS = -L$(top_builddir)/lib \
+	-lZMapApp -lZMap -lZMapThr -lZMap -lZMapXML \
+	-lpfetch -lcurlobj -lexpat -lpopt -lg2 -lgd \
 	@ACECONN_LIBS@ \
 	@GTK_LIBS@ \
 	@FOOCANVAS_LIBS@ \

src/Makefile.common

@@ -19,5 +19,7 @@ LIBS_ZMAP = $(top_builddir)/lib/libZMapApp.a \
 	$(top_builddir)/lib/libZMap.a \
 	$(top_builddir)/lib/libZMapThr.a \
         $(top_builddir)/lib/libZMapXML.a \
+        $(top_builddir)/lib/libpfetch.a \
+        $(top_builddir)/lib/libcurlobject.a \
 	$(NULL)
 

src/configure.ac

@@ -393,6 +393,8 @@ zmapWindow/Makefile
 zmapXML/Makefile
 include/Makefile
 lib/Makefile
+libpfetch/Makefile
+libcurlobject/Makefile
 zmap.pc
 dotZMap:dotZmap.in
 $srcdir/$DX_CONFIG:Doxyfile.in

src/lib/Makefile.am

@@ -8,6 +8,8 @@ LIBS_ZMAP_LOCAL = libZMapApp.a \
 	libZMap.a \
 	libZMapThr.a \
         libZMapXML.a \
+	libcurlobject.a \
+	libpfetch.a \
 	$(NULL)
 
 noinst_LIBRARIES = $(LIBS_ZMAP_LOCAL)
@@ -187,7 +189,23 @@ $(top_srcdir)/zmapThreads/zmapThreadsUtils.c \
 $(top_srcdir)/zmapThreads/zmapThreads_P.h \
 $(NULL)
 
+libpfetch_a_SOURCES = $(top_srcdir)/libpfetch/libpfetch.c \
+ $(top_srcdir)/libpfetch/libpfetch-utils.c \
+$(top_srcdir)/libpfetch/libpfetch_P.h \
+$(top_srcdir)/libpfetch/libpfetch.h \
+$(NULL)  
 
+libpfetch_a_marshal = $(top_srcdir)/libpfetch/libpfetch-cmarshal.list
+
+libpfetch_a_extra_sources = $(top_srcdir)/libpfetch/libpfetch-cmarshal.h \
+$(top_srcdir)/libpfetch/libpfetch-cmarshal.c \
+$(NULL)
+
+nodist_libpfetch_a_SOURCES = $(libpfetch_a_extra_sources)
+
+libcurlobject_a_SOURCES = $(top_srcdir)/libcurlobject/libcurlobject.c \
+$(top_srcdir)/libcurlobject/libcurlobject.h \
+$(NULL)  
 
 libZMapXML_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_srcdir)/zmapXML
@@ -196,6 +214,7 @@ libZMapApp_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_srcdir)/zmapApp \
 	-I$(top_srcdir)/zmapManager
 libZMap_a_CPPFLAGS = $(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/zmapConfig \
 	-I$(top_srcdir)/zmapControl \
 	-I$(top_srcdir)/zmapDocs \
@@ -211,11 +230,30 @@ libZMapThr_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_srcdir)/zmapServer/das \
 	-I$(top_srcdir)/zmapServer/file \
 	-I$(top_srcdir)/zmapThreads
+libpfetch_a_CPPFLAGS = $(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/libpfetch
+libcurlobject_a_CPPFLAGS = $(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/libcurlobject
 
 libZMapApp_a_DEPENDENCIES = 
-libZMap_a_DEPENDENCIES = libZMapXML.a
+libZMap_a_DEPENDENCIES = libZMapXML.a libpfetch.a
 libZMapThr_a_DEPENDENCIES = libZMapXML.a
 
+libpfetch_a_DEPENDENCIES = libcurlobject.a
+
+GENMARSHAL_COMMAND = $(GLIB_GENMARSHAL) --prefix=libpfetch_cmarshal
+
+.list.h:
+	$(GENMARSHAL_COMMAND) --header $< >$@
+
+.list.c:
+	$(GENMARSHAL_COMMAND) --body $< >$@
+
+BUILT_SOURCES = $(libpfetch_a_extra_sources)
+CLEANFILES = $(BUILT_SOURCES)
+EXTRA_DIST = $(libpfetch_a_marshal)   
 
 forcemake: