Index: INSTALL =================================================================== RCS file: /var/cvs/comedilib/INSTALL,v retrieving revision 1.2 diff -r1.2 INSTALL 0a1,10 > == Comedilib Installation Instructions =============================== > > 1. Linux > 1.1 Building > 2. FreeBSD > 2.1 Dependencies > 2.2 Building > 3. General Notes > > --[ Linux ]----------------------------------------------------------- 15,16c25,36 < To write programs that use comedi, look at examples in the demo/ and < the documentation in the doc/ directory. --- > --[ FreeBSD ]--------------------------------------------------------- > > * Dependencies : > > Some of the programs in the demo subdirectory require GNU getopt. > To build the newest version of this package from source, simply type : > > # cd /usr/ports/devel/libgnugetopt > # make install clean > > Or, if you would prefer to install the newest binary package, simply > type : 17a38,41 > # pkg_add -r libgnugetopt > > In either case the newest stable version of the library will be > installed on your system. 18a43,60 > * Building > > To build comedi lib, type > > $ gmake FREEBSD=1 > > This will tell the Makefiles to look in a different place for the > gnugetopt library and headers. In the future a configure script could > do this with autoconf but that is overkill at the moment; so please > excsuse this hack ;) > > If you do not have GNU make installed on your system, then you can > install the devel/gmake port or package as described above. > > --[ General Notes ]--------------------------------------------------- > > To write programs that use comedi, look at examples in the demo/ and > the documentation in the doc/ directory. Index: comedi_calibrate/Makefile =================================================================== RCS file: /var/cvs/comedilib/comedi_calibrate/Makefile,v retrieving revision 1.3 diff -r1.3 Makefile 1,3d0 < < < 6a4,9 > # FreeBSD does not come with GNU GetOpt by default, so it > # will be installed in /usr/local > ifeq ($(FREEBSD),1) > LDFLAGS+=-L/usr/local/lib -lgnugetopt > CFLAGS+=-I/usr/local/include > endif Index: comedi_calibrate/comedi_calibrate.c =================================================================== RCS file: /var/cvs/comedilib/comedi_calibrate/comedi_calibrate.c,v retrieving revision 1.7 diff -r1.7 comedi_calibrate.c 35c35,38 < --- > #ifndef __linux__ > #include > #define INFINITY FLT_MAX > #endif 102c105 < }linear_fit_t; --- > } linear_fit_t; Index: comedi_config/Makefile =================================================================== RCS file: /var/cvs/comedilib/comedi_config/Makefile,v retrieving revision 1.2 diff -r1.2 Makefile 3d2 < #LDFLAGS=-L../lib/ -lcomedi 4a4,11 > #LDFLAGS=-L../lib/ -lcomedi > > # FreeBSD does not come with GNU GetOpt by default, so it > # will be installed in /usr/local > ifeq ($(FREEBSD),1) > LDFLAGS+=-L/usr/local/lib -lgnugetopt > CFLAGS+=-I/usr/local/include > endif Index: comedi_config/comedi_config.c =================================================================== RCS file: /var/cvs/comedilib/comedi_config/comedi_config.c,v retrieving revision 1.14 diff -r1.14 comedi_config.c 27a28 > #ifdef __linux__ 28a30 > #endif Index: demo/Makefile =================================================================== RCS file: /var/cvs/comedilib/demo/Makefile,v retrieving revision 1.9 diff -r1.9 Makefile 1,3d0 < < < 7a5,10 > # FreeBSD does not come with GNU GetOpt by default, so it > # will be installed in /usr/local > ifeq ($(FREEBSD),1) > LDFLAGS+=-L/usr/local/lib -lgnugetopt > CFLAGS+=-I/usr/local/include > endif Index: demo/ledclock.c =================================================================== RCS file: /var/cvs/comedilib/demo/ledclock.c,v retrieving revision 1.1 diff -r1.1 ledclock.c 131a132,134 > #ifdef __linux__ > /* XXX - F_SETSIG is Linux specific. POSIX handles this with > aio_sigevent */ 133a137 > #endif Index: demo/main.c =================================================================== RCS file: /var/cvs/comedilib/demo/main.c,v retrieving revision 1.4 diff -r1.4 main.c 12a13,16 > #ifdef __FreeBSD__ > #include > #else > /* is malloc.h really still encouraged over stdlib in Linux? */ 13a18 > #endif Index: demo/sigio.c =================================================================== RCS file: /var/cvs/comedilib/demo/sigio.c,v retrieving revision 1.1 diff -r1.1 sigio.c 111a112,114 > #ifdef __linux__ > /* XXX - F_SETSIG is Linux specific. POSIX handles this with > aio_sigevent */ 113a117 > #endif Index: testing/Makefile =================================================================== RCS file: /var/cvs/comedilib/testing/Makefile,v retrieving revision 1.7 diff -r1.7 Makefile 1,3d0 < < < 6a4,9 > # FreeBSD does not come with GNU GetOpt by default, so it > # will be installed in /usr/local > ifeq ($(FREEBSD),1) > LDFLAGS+=-L/usr/local/lib -lgnugetopt > CFLAGS+=-I/usr/local/include > endif