*** empty log message ***

4 files changed, 18 insertions, 12 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index af68d29..a0033bc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,6 +8,9 @@
 # $Id$
 #
 # $Log$
+# Revision 1.8  2009/02/08 18:35:52  root
+# *** empty log message ***
+#
 # Revision 1.7  2009/02/08 18:28:31  root
 # *** empty log message ***
 #
@@ -35,7 +38,7 @@
 
 INCLUDES = ${LIBGOBJ_INC}
 
-SRCS= libjwg.c version.c cgm.c contour.c version.c xfig.c util.c cd/cd.c
+SRCS= libjwg.c version.c cgm.c contour.c version.c xfig.c util.c 
 CPROTO=cproto
 
 JWGSRCS=${SRCS} 
@@ -43,8 +46,8 @@ JWGSRCS=${SRCS}
 noinst_HEADERS= project.h prototypes.h jwg-tail.h ext_prototypes.h
 
 
-libjwg_a_SOURCES =  ${JWGSRCS} 
-libjwg_la_SOURCES = ${JWGSRCS} 
+libjwg_a_SOURCES =  ${JWGSRCS}  cd/cd.c
+libjwg_la_SOURCES = ${JWGSRCS} cd/cd.c
 
 libjwg_a_CFLAGS = ${AM_CFLAGS}
 
diff --git a/src/libjwg.c b/src/libjwg.c
index b86fbda..e92da2e 100644
--- a/src/libjwg.c
+++ b/src/libjwg.c
@@ -32,13 +32,13 @@ static void Handle_Destructor(Handle handle)
 {
 printf("JWG: Destroying handle %d\n",handle->serial);
 
-Obj_Delete(handle->private);
+GObj_Delete(handle->private);
 
 fclose(handle->file);
 
-if (handle->data) Obj_Delete(handle->data);
+if (handle->data) GObj_Delete(handle->data);
 
-Obj_Remove(handle_list,handle);
+GObj_Remove(handle_list,handle);
 free(handle);
 
 }
@@ -89,7 +89,7 @@ return(s);
 }
 
 
-static void jwg_xform(Handle h,Jwgpos *pos)
+INTERNAL  void jwg_xform(Handle h,Jwgpos *pos)
 {
 float x,y;
 
@@ -238,7 +238,7 @@ h->ink.height*=h->transform.det;
 }
 
 
-static  void jwg_write_line(Handle h,Jwgline *line)
+INTERNAL   void jwg_write_line(Handle h,Jwgline *line)
 {
 
  
@@ -255,7 +255,7 @@ case 1:
 
 }
 
-static  void jwg_write_polygon(Handle h,Jwgline *line)
+INTERNAL   void jwg_write_polygon(Handle h,Jwgline *line)
 {
  
 switch (h->format) {
@@ -406,7 +406,7 @@ dptr+=data->w;
 void jwg_destroy_data(int *serial)
 {
 Handle h=handle_from_serial(*serial);
-if (h->data) Obj_Delete(h->data);
+if (h->data) GObj_Delete(h->data);
 h->data=(Data) NULL;
 }
 
@@ -673,7 +673,7 @@ h->current_line.npts=0;
 void jwg_destroy_handle(int *serial) 
 {
 Handle h=handle_from_serial(*serial);
-Obj_Delete(h);
+GObj_Delete(h);
 }
 
 
diff --git a/src/prototypes.h b/src/prototypes.h
index 998a157..b0aac6f 100644
--- a/src/prototypes.h
+++ b/src/prototypes.h
@@ -3,6 +3,9 @@ void (*Data_default_constructor)(Data);
 void (*Data_default_destructor)(Data);
 void (*Handle_default_constructor)(Handle);
 void (*Handle_default_destructor)(Handle);
+void jwg_xform(Handle h, Jwgpos *pos);
+void jwg_write_line(Handle h, Jwgline *line);
+void jwg_write_polygon(Handle h, Jwgline *line);
 int jwg_create_handle__(int *format, char *fname, int len);
 void jwg_pass_data__(int *serial, float *ptr, int *w, int *h, int *l);
 void jwg_destroy_data__(int *serial);
diff --git a/src/xfig.c b/src/xfig.c
index 8870541..3f4c42a 100644
--- a/src/xfig.c
+++ b/src/xfig.c
@@ -68,7 +68,7 @@ c=c->next;
 }
 
 
-Obj_Delete(p->xfcs);
+GObj_Delete(p->xfcs);
 
 printf("JWG: Writing xfig file\n");