stv0g/comedilib
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixes to make python and docs build correctly

Browse source
This commit is contained in:
David Schleef 2003-06-04 02:42:08 +00:00
parent 90b41e5960
commit 2cdfa17091
7 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile.am
View file

@ -1,5 +1,6 @@
SUBDIRS = lib comedi_calibrate comedi_config man testing demo doc
SUBDIRS = lib comedi_calibrate comedi_config man testing demo doc python \
include
#pkgconfigdir = $(libdir)/pkgconfig
#pkgconfig_DATA = comedilib.pc

19
configure.ac
View file

@ -25,14 +25,33 @@ COMEDILIB_LIBS="$COMEDILIB_LIBS \$(top_builddir)/lib/libcomedi.la -lm"
AC_SUBST(COMEDILIB_CFLAGS)
AC_SUBST(COMEDILIB_LIBS)
AM_PATH_PYTHON
AC_MSG_CHECKING(for python >= 2.2)
prog="
import sys, string
minver = (2,2,0,'final',0)
if sys.version_info < minver:
sys.exit(1)
sys.exit(0)"
if $PYTHON -c "$prog" 2>&AC_FD_CC 2>&AC_FD_CC
then
AC_MSG_RESULT(ok)
else
AC_MSG_ERROR(too old)
fi
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
AC_CONFIG_FILES(
Makefile
comedi_calibrate/Makefile
comedi_config/Makefile
doc/Makefile
demo/Makefile
include/Makefile
lib/Makefile
man/Makefile
python/Makefile
testing/Makefile
)

8
doc/Makefile.am
View file

@ -3,7 +3,7 @@ DOC=comedilib
SGML= drivers.sgml funcref.sgml glossary.sgml \
install.sgml intro.sgml other.sgml reference.sgml tutorial.sgml
EXTRA_DIST=$(SGML) funcref mkref drivers.txt mkdr
EXTRA_DIST=$(SGML) comedilib.sgml funcref mkref drivers.txt mkdr
all-local: html $(DOC).pdf man
@ -11,6 +11,12 @@ clean-local:
rm -rf comedilib.pdf drivers.sgml funcref.sgml
rm -rf html man
install-data-local:
$(INSTALL) -d $(mandir)/man3
$(INSTALL) man/*.3 $(mandir)/man3
$(INSTALL) -d $(pkgdatadir)/html
$(INSTALL) html/* $(pkgdatadir)/html
locales = de
$(DOC).pdf: $(DOC).sgml $(SGML)

2
python/Makefile.am
View file

@ -7,7 +7,7 @@ pycomedi_la_LDFLAGS = -module -avoid-version $(COMEDILIB_LIBS)
pyexec_SCRIPTS = comedi.py
EXTRA_DIST = comedi.i
EXTRA_DIST = comedi.i README.txt comedi.py setup.py test_comedi.py
install-exec-local:

8
python/comedi.i
View file

@ -11,8 +11,8 @@
***********************************************************/
%module comedi
%{
#include "../comedilib-0.7.19/include/comedi.h"
#include "../comedilib-0.7.19/include/comedilib.h"
#include "../include/comedi.h"
#include "../include/comedilib.h"
%}
%include "carrays.i"
@ -36,5 +36,5 @@ static unsigned int cr_aref(unsigned int a){
%array_class(unsigned int, chanlist);
%include "../comedilib-0.7.19/include/comedi.h"
%include "../comedilib-0.7.19/include/comedilib.h"
%include "../include/comedi.h"
%include "../include/comedilib.h"

4
python/comedi_wrap.c
View file

@ -679,8 +679,8 @@ static swig_type_info *swig_types[27];
#define SWIG_name "_comedi"
#include "../comedilib-0.7.19/include/comedi.h"
#include "../comedilib-0.7.19/include/comedilib.h"
#include "../include/comedi.h"
#include "../include/comedilib.h"
static unsigned int cr_pack(unsigned int chan, unsigned int rng, unsigned int aref){

4
python/setup.py
View file

@ -3,8 +3,8 @@ from distutils.core import setup, Extension
module1 = Extension('_comedi',
define_macros = [('MAJOR_VERSION','0'),
('MINOR_VERSION','1')],
include_dirs = ['../comedilib-0.7.19/include'],
library_dirs = ['../comedilib-0.7.19/lib'],
include_dirs = ['../include'],
library_dirs = ['../lib'],
libraries = ['comedi'],
sources = ['comedi_wrap.c'])