Update of /cvsroot/foo/foo/elkfoo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15202
Modified Files:
Makefile.am bpf.m context.m fooinit.m fractone.c misc.c
Log Message:
build system related fixes
Index: fractone.c
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/fractone.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fractone.c 4 Aug 2004 07:15:58 -0000 1.1
--- fractone.c 5 Aug 2004 08:55:09 -0000 1.2
***************
*** 33,46 ****
/* $Id */
! /* #include "config.h" */
#include <stdio.h>
#include <math.h>
! /* #ifdef HAVE_FOOELK_SCHEME_H */
#include <fooelk/scheme.h>
! /* #else */
! /* #include <elk/scheme.h> */
! /* #endif */
#define SEMI_TONE_CHARACTER 's'
--- 33,48 ----
/* $Id */
! #ifdef HAVE_CONFIG_H
! #include "config.h"
! #endif
#include <stdio.h>
#include <math.h>
! #ifdef HAVE_FOOELK_SCHEME_H
#include <fooelk/scheme.h>
! #else
! #include <elk/scheme.h>
! #endif
#define SEMI_TONE_CHARACTER 's'
Index: context.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/context.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** context.m 4 Aug 2004 07:15:58 -0000 1.1
--- context.m 5 Aug 2004 08:55:09 -0000 1.2
***************
*** 31,35 ****
*/
! #ifdef HAVE_CONTEXT_H
#include "config.h"
#endif
--- 31,35 ----
*/
! #ifdef HAVE_CONFIG_H
#include "config.h"
#endif
***************
*** 39,47 ****
#define Object SchemeObject /* avoid Obj-C type clash */
! // #ifdef HAVE_FOOELK_SCHEME_H
#include <fooelk/scheme.h>
! // #else
! // #include <elk/scheme.h>
! // #endif
#undef Object
--- 39,47 ----
#define Object SchemeObject /* avoid Obj-C type clash */
! #ifdef HAVE_FOOELK_SCHEME_H
#include <fooelk/scheme.h>
! #else
! #include <elk/scheme.h>
! #endif
#undef Object
Index: misc.c
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/misc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** misc.c 4 Aug 2004 07:15:58 -0000 1.1
--- misc.c 5 Aug 2004 08:55:09 -0000 1.2
***************
*** 31,41 ****
*/
! /* #include "config.h" */
! /* #ifdef HAVE_FOOELK_SCHEME_H */
#include <fooelk/scheme.h>
! /* #else */
! /* #include <elk/scheme.h> */
! /* #endif */
#include <unistd.h>
--- 31,43 ----
*/
! #ifdef HAVE_CONFIG_H
! #include "config.h"
! #endif
! #ifdef HAVE_FOOELK_SCHEME_H
#include <fooelk/scheme.h>
! #else
! #include <elk/scheme.h>
! #endif
#include <unistd.h>
Index: fooinit.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/fooinit.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fooinit.m 4 Aug 2004 07:15:58 -0000 1.1
--- fooinit.m 5 Aug 2004 08:55:09 -0000 1.2
***************
*** 35,39 ****
#ifdef HAVE_CONFIG_H
#include "config.h"
! #endif // #ifdef HAVE_CONFIG_H
#include <stdio.h>
--- 35,39 ----
#ifdef HAVE_CONFIG_H
#include "config.h"
! #endif
#include <stdio.h>
Index: Makefile.am
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am 4 Aug 2004 07:15:58 -0000 1.1
--- Makefile.am 5 Aug 2004 08:55:09 -0000 1.2
***************
*** 6,19 ****
NULL =
! bin_PROGRAMS = elkfoo
pkglib_LTLIBRARIES = elkfoo.la
! elkfoo_SOURCES = \
! main.c \
! $(NULL)
elkfoo_la_SOURCES = \
- fractone.c \
- misc.c \
bpf.m \
context.m \
--- 6,17 ----
NULL =
! # bin_PROGRAMS = elkfoo
pkglib_LTLIBRARIES = elkfoo.la
! #elkfoo_SOURCES = \
! # main.c \
! # $(NULL)
elkfoo_la_SOURCES = \
bpf.m \
context.m \
***************
*** 29,32 ****
--- 27,32 ----
task.m \
tell.m \
+ misc.c \
+ fractone.c \
$(NULL)
***************
*** 49,58 ****
-module -avoid-version -no-undefined
elkfoo_la_LIBADD = $(ELKFOO_LIBS) $(FND_LIBS) \
-lobjc
! elkfoo_CFLAGS = $(ELKFOO_CFLAGS) @FOO_GNUSTEP_OBJCFLAGS@
! elkfoo_OBJCFLAGS = $(ELKFOO_OBJCFLAGS) \
! $(FND_DEFINE)
! elkfoo_LDFLAGS = $(ELKFOO_LDFLAGS)
! elkfoo_LDADD = $(ELKFOO_LIBS) $(FND_LIBS) \
! -lobjc
--- 49,60 ----
-module -avoid-version -no-undefined
elkfoo_la_LIBADD = $(ELKFOO_LIBS) $(FND_LIBS) \
+ ../../libfoo/src/libfoo.la \
-lobjc
!
! #elkfoo_CFLAGS = $(ELKFOO_CFLAGS) @FOO_GNUSTEP_OBJCFLAGS@
! #elkfoo_OBJCFLAGS = $(ELKFOO_OBJCFLAGS) \
! # $(FND_DEFINE)
! #elkfoo_LDFLAGS = $(ELKFOO_LDFLAGS)
! #elkfoo_LDADD = $(ELKFOO_LIBS) $(FND_LIBS) \
! # -lobjc
Index: bpf.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/bpf.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bpf.m 4 Aug 2004 07:15:58 -0000 1.1
--- bpf.m 5 Aug 2004 08:55:09 -0000 1.2
***************
*** 38,46 ****
#define Object SchemeObject /* avoid Obj-C type clash */
! // #ifdef HAVE_FOOELK_SCHEME_H
#include <fooelk/scheme.h>
! // #else
! // #include <elk/scheme.h>
! // #endif
#undef Object
--- 38,46 ----
#define Object SchemeObject /* avoid Obj-C type clash */
! #ifdef HAVE_FOOELK_SCHEME_H
#include <fooelk/scheme.h>
! #else
! #include <elk/scheme.h>
! #endif
#undef Object
|
