aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.am3
-rw-r--r--configure.in17
-rw-r--r--kernel/Makefile.am5
-rw-r--r--mpio.spec.in22
5 files changed, 28 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index ece8bbd..b25571d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-24 Markus Germeier <mager@tzi.de>
+ * small build environment updates
+ * updated mpio.spec.in file
+
2004-03-21 Markus Germeier <mager@tzi.de>
* fixed build environment
* kernel module is (finally) deprecated
diff --git a/Makefile.am b/Makefile.am
index e5b41be..97b52e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
SUBDIRS=@MPIO_KERNEL@ libmpio mpiosh etc tools
-sbin_SCRIPTS=mkmpiodev
-EXTRA_DIST=mpio.spec mkmpiodev
+EXTRA_DIST=mpio.spec
diff --git a/configure.in b/configure.in
index f96349f..33ea3ed 100644
--- a/configure.in
+++ b/configure.in
@@ -4,13 +4,18 @@ dnl Process this file with autoconf to produce a configure script.
dnl we need autoconf >= 2.50
AC_PREREQ(2.50)
-AC_INIT(kernel/mpio.c)
+AC_INIT(libmpio/src/mpio.c)
dnl AM_CONFIG_HEADER(src/config.h)
AC_CANONICAL_SYSTEM()
AC_MSG_RESULT(Building for a ${host} host.)
-AM_INIT_AUTOMAKE(mpio, 0.7.1-2003101901)
+AM_INIT_AUTOMAKE(mpio, 0.7.1-1.2004032415)
+
+dnl build release variable
+RELEASE=`echo $VERSION | cut -d- -f2`
+VERSION=`echo $VERSION | cut -d- -f1`
+AC_SUBST(RELEASE)
dnl Checks for programs.
@@ -73,12 +78,13 @@ if test -n "${LIBUSB_CONFIG}"; then
LDFLAGS="$LDFLAGS_orig"])
CPPFLAGS="$CPPFLAGS_save"
fi
+set > /tmp/set.foo
# This 'test' call uses non-standard syntax and will fail on most
# systems, but it's just informational so any warning can be ignored.
-if test "$LIBUSB_VER" \< "0.1.6"; then
+if test "$LIBUSB_VER" \< "0.1.7"; then
AC_MSG_WARN([
-*** You need at least version 0.1.6 of the libusb library for USB support
+*** You need at least version 0.1.7 of the libusb library for USB support
*** http://sourceforge.net/projects/libusb/
*** If you cannot find the appropriate version, try CVS
])
@@ -161,11 +167,8 @@ AC_SUBST(MPIO_KERNEL)
dnl ------------------------------------------------------------
-# could not find a way to compile the kernel module correctly
-# kernel/Makefile
AC_OUTPUT(
Makefile
- kernel/Makefile
libmpio/Makefile
mpiosh/Makefile
etc/Makefile
diff --git a/kernel/Makefile.am b/kernel/Makefile.am
index f483040..b5248f2 100644
--- a/kernel/Makefile.am
+++ b/kernel/Makefile.am
@@ -4,7 +4,9 @@ KCFLAGS=-D__KERNEL__ -Wall -Wstrict-prototypes -O2 \
EXTRA_DIST=mpio.c
-all: mpio.o
+all: @MPIO_KERNEL@
+
+kernel: mpio.o
mpio.o: mpio.c
$(CC) -c $(KCFLAGS) $(INCLUDES) $<
@@ -16,5 +18,6 @@ distclean:
rm -f mpio.o
install-data-local:
+ @test -n "@MODULE_PATH@" || exit 0
$(mkinstalldirs) $(DESTDIR)@MODULE_PATH@
$(INSTALL_SCRIPT) -m 644 mpio.o $(DESTDIR)@MODULE_PATH@
diff --git a/mpio.spec.in b/mpio.spec.in
index e802974..7ffa6d5 100644
--- a/mpio.spec.in
+++ b/mpio.spec.in
@@ -1,8 +1,7 @@
# -*- rpm-spec -*-
%define version @VERSION@
-%define release 1
+%define release @RELEASE@
%define name mpio
-%define spec_path @SPEC_PATH@
%define prefix /usr
%define sysconfdir %prefix/etc
@@ -16,11 +15,16 @@ Source: http://download.sourceforge.net/mpio/mpio-@VERSION@.tar.gz
Prefix: %prefix
Buildroot: /var/tmp/mpio-@VERSION@-buildroot/
Packager: Andreas Bsching <crunchy@tzi.de>
+Requires: libusb >= 0.1.7, readline >= 4.3, ncurses >= 5.0
+BuildRequires: libusb-devel >= 0.1.7
+BuildRequires: readline-devel >= 4.3
+BuildRequires: ncurses-devel >= 5.0
-%description
+%description
This is a project for using Digitalway/Adtec digital audio player MPIO
-(DMG, DMK, DME) under Linux. It provides Linux kernel module driver,
-a userspace library and at the moment one tool to access the MPIO player.
+(DMG, DMK, DME, DMB, FD 100, FL100, FY100, FY200) under Linux. It uses
+libusb and provides a userspace library and at the moment one tool to
+access the MPIO player.
%prep
%setup
@@ -38,9 +42,6 @@ echo "%prefix/bin/mpiosh" >> /tmp/mpio-files.lst
echo "%prefix/bin/mpiologo" >> /tmp/mpio-files.lst
echo "%prefix/lib/libmpio*" >> /tmp/mpio-files.lst
echo "%defattr(700,root,root)" >> /tmp/mpio-files.lst
-echo "%prefix/sbin/mkmpiodev" >> /tmp/mpio-files.lst
-echo "%defattr(644,root,root)" >> /tmp/mpio-files.lst
-echo "/lib/modules/$KVERSION/%{spec_path}/mpio.o" >> /tmp/mpio-files.lst
echo "%defattr(644,root,root)" >> /tmp/mpio-files.lst
echo "%sysconfdir/mpio/mpioshrc" >> /tmp/mpio-files.lst
echo "%prefix/include/mpio/mpio.h" >> /tmp/mpio-files.lst
@@ -49,12 +50,7 @@ echo "%prefix/include/mpio/defs.h" >> /tmp/mpio-files.lst
make DESTDIR=$RPM_BUILD_ROOT install
%post
-mkmpiodev
ldconfig
-depmod -a
-
-%preun
-mkmpiodev -r
%files -f /tmp/mpio-files.lst