[foo-cvs] foo/elkfoo/src Makefile.am,1.2,1.3 bpf.m,1.2,1.3 context.m,1.2,1.3 fooinit.m,1.2,1.3 module.m,1.1,1.2 modules.m,1.1,1.2 pointer.m,1.1,1.2 signals.m,1.1,1.2 snd.m,1.1,1.2 soundfile.m,1.1,1.2 task.m,1.1,1.2 tell.m,1.1,1.2

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32270

Modified Files:
	Makefile.am bpf.m context.m fooinit.m module.m modules.m 
	pointer.m signals.m snd.m soundfile.m task.m tell.m 
Log Message:
adopted src files to new catchall-header

Index: tell.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/tell.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tell.m	4 Aug 2004 07:15:58 -0000	1.1
--- tell.m	5 Aug 2004 18:58:52 -0000	1.2
***************
*** 57,62 ****
  #undef Object
  
! #include "pointer.h"
! #include "tell.h"
  
  #define SKIP_BODY(p, c) while (*p != c) if (!*p) goto format_error; else p++;
--- 57,61 ----
  #undef Object
  
! #include "elkfoo.h"
  
  #define SKIP_BODY(p, c) while (*p != c) if (!*p) goto format_error; else p++;

Index: signals.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/signals.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** signals.m	4 Aug 2004 07:15:58 -0000	1.1
--- signals.m	5 Aug 2004 18:58:52 -0000	1.2
***************
*** 47,52 ****
  #undef Object
  
! #include "signals.h"
! #include "module.h"
  
  int T_Signal;
--- 47,51 ----
  #undef Object
  
! #include "elkfoo.h"
  
  int T_Signal;

Index: module.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/module.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** module.m	4 Aug 2004 07:15:58 -0000	1.1
--- module.m	5 Aug 2004 18:58:52 -0000	1.2
***************
*** 47,53 ****
  #undef Object
  
! #include "pointer.h"
! #include "context.h"
! #include "module.h"
  
  int T_Module;
--- 47,51 ----
  #undef Object
  
! #include "elkfoo.h"
  
  int T_Module;

Index: modules.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/modules.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** modules.m	4 Aug 2004 07:15:58 -0000	1.1
--- modules.m	5 Aug 2004 18:58:52 -0000	1.2
***************
*** 82,90 ****
  #include <sys/timeb.h>
  
! #include "module.h"
! #include "snd.h"
! #include "bpf.h"
! #include "signals.h"
! #include "context.h"
  
  #define IdOf(module) (MODULE_T(module)->pointer)
--- 82,86 ----
  #include <sys/timeb.h>
  
! #include "elkfoo.h"
  
  #define IdOf(module) (MODULE_T(module)->pointer)

Index: soundfile.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/soundfile.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** soundfile.m	4 Aug 2004 07:15:58 -0000	1.1
--- soundfile.m	5 Aug 2004 18:58:52 -0000	1.2
***************
*** 54,60 ****
  #undef Object
  
! #include "context.h"
! #include "pointer.h"
! #include "snd.h"
  
  SchemeObject General_File_Operation (SchemeObject s, int op);
--- 54,58 ----
  #undef Object
  
! #include "elkfoo.h"
  
  SchemeObject General_File_Operation (SchemeObject s, int op);

Index: bpf.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/bpf.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** bpf.m	5 Aug 2004 08:55:09 -0000	1.2
--- bpf.m	5 Aug 2004 18:58:52 -0000	1.3
***************
*** 45,51 ****
  #undef Object
  
! #include "context.h"
! #include "pointer.h"
! #include "bpf.h"
  
  int T_Bpf;
--- 45,49 ----
  #undef Object
  
! #include "elkfoo.h"
  
  int T_Bpf;

Index: snd.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/snd.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** snd.m	4 Aug 2004 07:15:58 -0000	1.1
--- snd.m	5 Aug 2004 18:58:52 -0000	1.2
***************
*** 53,59 ****
  #undef Object
  
! #include "context.h"
! #include "pointer.h"
! #include "snd.h"
  
  int T_Snd;
--- 53,57 ----
  #undef Object
  
! #include "elkfoo.h"
  
  int T_Snd;

Index: context.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/context.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** context.m	5 Aug 2004 08:55:09 -0000	1.2
--- context.m	5 Aug 2004 18:58:52 -0000	1.3
***************
*** 46,51 ****
  #undef Object
  
! #include "context.h"
! #include "pointer.h"
  
  int T_Context;
--- 46,50 ----
  #undef Object
  
! #include "elkfoo.h"
  
  int T_Context;

Index: fooinit.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/fooinit.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fooinit.m	5 Aug 2004 08:55:09 -0000	1.2
--- fooinit.m	5 Aug 2004 18:58:52 -0000	1.3
***************
*** 119,123 ****
    Define_Primitive(P_Version,	"foo:version",		0, 0, EVAL);
  
!   P_Provide(Intern("libfoo.la"));
  
  } /* elk_init_foo_fooinit */
--- 119,123 ----
    Define_Primitive(P_Version,	"foo:version",		0, 0, EVAL);
  
!   P_Provide(Intern("elkfoo.la"));
  
  } /* elk_init_foo_fooinit */

Index: pointer.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/pointer.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pointer.m	4 Aug 2004 07:15:58 -0000	1.1
--- pointer.m	5 Aug 2004 18:58:52 -0000	1.2
***************
*** 47,51 ****
  #undef Object
  
! #include "pointer.h"
  
  int T_Pointer;
--- 47,51 ----
  #undef Object
  
! #include "elkfoo.h"
  
  int T_Pointer;

Index: task.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/task.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** task.m	4 Aug 2004 07:15:58 -0000	1.1
--- task.m	5 Aug 2004 18:58:52 -0000	1.2
***************
*** 52,59 ****
  #undef Object
  
! #include "context.h"
! #include "pointer.h"
! #include "snd.h"
! #include "task.h"
  
  SchemeObject General_File_Operation (SchemeObject s, int op); /* in io.c */
--- 52,56 ----
  #undef Object
  
! #include "elkfoo.h"
  
  SchemeObject General_File_Operation (SchemeObject s, int op); /* in io.c */

Index: Makefile.am
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	5 Aug 2004 08:55:09 -0000	1.2
--- Makefile.am	5 Aug 2004 18:58:51 -0000	1.3
***************
*** 9,12 ****
--- 9,14 ----
  pkglib_LTLIBRARIES = elkfoo.la
  
+ pkglibdir = @ELK_LIB_DIR@
+ 
  #elkfoo_SOURCES = \
  #	main.c \
***************
*** 52,55 ****
--- 54,58 ----
  			-lobjc
  
+ extensionsdir = $(pkgincludedir)/extensions
  
  #elkfoo_CFLAGS =		$(ELKFOO_CFLAGS) @FOO_GNUSTEP_OBJCFLAGS@