Misc. Makefile changes.

Bumped up version.

8 files changed, 120 insertions, 5 deletions

diff --git a/Makefile.am b/Makefile.am
index def9a41..4298800 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,13 +5,21 @@ EXTRA_DIST = COPYING README TODO INSTALL README.mjg include/*.h* etc/*magic etc/
 DISTCLEANFILES = etc/psion
 AUTOMAKE_OPTIONS = foreign
 
+TMPDEST=
 #
 # remove all intermediate files that can be recreated using
 # Makefile.cvs
 #
 maintainer-clean-local:
 	rm -f configure aclocal.m4 config.guess config.sub Makefile.in \
-		install-sh ltconfig ltmain.sh missing mkinstalldirs
+		install-sh ltconfig ltmain.sh missing mkinstalldirs etc/*.spec
+
+dist-hook:
+	$(MAKE) TMPDEST=$(distdir)/ kdoc specfile
 
 kdoc:
-	kdoc -d doc/api -n libplp lib/*.h
+	kdoc -d $(TMPDEST)doc/api -n libplp $(TMPDEST)lib/*.h
+
+specfile:
+	sed -e "s/_VERSION_/$(VERSION)/" < $(TMPDEST)etc/plptools.spec.in \
+		> $(TMPDEST)etc/plptools.spec
diff --git a/configure.in b/configure.in
index e73ecd3..7664fec 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_REVISION($Revision$)dnl revision of this configure.in script
 AC_INIT(acinclude.m4)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(include/config.h)
-AM_INIT_AUTOMAKE(plptools, 0.6)
+AM_INIT_AUTOMAKE(plptools, 0.7)
 AM_PROG_LIBTOOL
 
 dnl Enable Maintainer stuff
@@ -12,6 +12,7 @@ AM_MAINTAINER_MODE
 dnl checks for programs
 AC_AIX
 AC_PROG_MAKE_SET
+AC_PROG_CXX
 AC_CHECK_COMPILERS
 AC_PROG_AWK
 AC_PATH_PROG(SED,sed)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c989bbf..2387ae8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -12,3 +12,9 @@ man_MANS = ncpd.8 plpnfsd.8 plpftp.1
 	MANDATE=`grep CHECKIN $< | $(AWK) '{print $$4}'` ; \
 	$(SED) -e "s%@MANDATE@%$$MANDATE%g" $< > $@
 
+#
+# remove all intermediate files that can be recreated using
+# Makefile.cvs
+#
+maintainer-clean-local:
+	rm -f Makefile.in *.1 *.8
diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
index 1204cab..7206800 100644
--- a/doc/api/Makefile.am
+++ b/doc/api/Makefile.am
@@ -1 +1,8 @@
 EXTRA_DIST = $(wildcard *.html)
+
+#
+# remove all intermediate files that can be recreated using
+# Makefile.cvs
+#
+maintainer-clean-local:
+	rm -f Makefile.in *.html
diff --git a/etc/.cvsignore b/etc/.cvsignore
index dc8189b..86114be 100644
--- a/etc/.cvsignore
+++ b/etc/.cvsignore
@@ -1 +1,2 @@
 psion
+plptools.spec
diff --git a/etc/plptools.spec.in b/etc/plptools.spec.in
new file mode 100644
index 0000000..0d08300
--- /dev/null
+++ b/etc/plptools.spec.in
@@ -0,0 +1,92 @@
+Summary: Connectivity for psion series 5.
+Name: plptools
+%define version _VERSION_
+Version: %{version}
+Release: 1
+Vendor: Thinking Objects Software GmbH
+Packager: Fritz Elfert <fritz.elfert@to.com>
+URL: http://sourceforge.net/projects/plptools
+Source0: http://download.sourceforge.net/plptools/plptools-%{version}.tar.gz
+Copyright: GPL
+Group: Networking/Utilities
+Requires: chkconfig >= 0.9
+Buildrequires: libreadline
+BuildRoot: /tmp/plputils-buildroot
+
+%package devel
+Summary: Static library and includes for psion series 5 communication.
+Group: Development/Libraries
+
+%description
+This package contains the programs (client and server), necessary to
+communicate with a psion series 5. The psion's file-system will
+be automatically mounted under /mnt/psion at the time it is
+connected to your computer. If the psion is shut down or
+disconnected, the contents of /mnt/psion will automatically
+disappear. A second program (plpftp) allows you to transfer
+files in a ftp-like manner.
+
+%description devel
+This package contains the static library and include files for building
+programs which can communicate with a psion series 5.
+
+%description -l de
+Dieses Packet enthält Programme zur Kommunikation mit einem Psion 5.
+Das Dateisystem des Psion wird beim Anschließen automatisch unter
+/mnt/psion eingehängt. Wird der Psion ausgeschaltet oder das Kabel
+gezogen, so verschwindet der Inhalt dieses Verzeichnisses automatisch
+und erscheint erneuten Anschließen wieder. Ein weiteres Programm ist
+plpftp, welches eine FTP-ähnliche Oberfläche für Dateitransfer
+bietet.
+
+%description -l de devel
+Dieses Packet enthält die statische Bibliothek und include-Dateien
+zur Programm-Entwicklung von Kommunikations-software für den Psion 5.
+
+%changelog
+* Mon Jan 17 2000 Fritz Elfert <fritz.elfert@to.com>
+- New version 0.5 with lots of bugfixes and additions.
+
+* Sat Aug  7 1999 Fritz Elfert <fritz.elfert@to.com>
+- fixed violation of const parameters in rfsv32.cc.
+- corrected BLOCKSIZE in mp.h to fix behaviour of "du" program.
+
+%prep
+%setup
+
+%build
+%configure
+make
+
+%install
+mkdir -p $RPM_BUILD_ROOT/usr $RPM_BUILD_ROOT/etc/rc.d/init.d
+%makeinstall
+install -m755 etc/psion $RPM_BUILD_ROOT/etc/rc.d/init.d
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+ldconfig
+/sbin/chkconfig --add psion
+/etc/rc.d/init.d/psion restart
+
+%preun
+if [ "$1" = 0 ]
+then
+	/etc/rc.d/init.d/psion stop >&2
+	/sbin/chkconfig --del psion
+fi
+
+%files
+%doc COPYING INSTALL CHANGES README* TODO etc/*magic patches
+%{_bindir}/*
+%{_sbindir}/*
+%{_mandir}/*/*
+%{_libdir}/libplp.so*
+%config /etc/rc.d/init.d/psion
+
+%files devel
+%doc doc/api etc/*.spec
+%{_libdir}/libplp.a
+%{_includedir}/%{name}/*
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 404814e..af983e3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,7 +6,7 @@ libplp_la_LDFLAGS = --debug -version-info 1:1:0
 libplp_la_SOURCES = bufferarray.cc  bufferstore.cc iowatch.cc ppsocket.cc \
 	rfsv16.cc rfsv32.cc rfsvfactory.cc log.cc rfsv.cc rpcs32.cc rpcs16.cc \
 	rpcs.cc rpcsfactory.cc psitime.cc Enum.cc
-EXTRA_DIST = bool.h bufferarray.h bufferstore.h iowatch.h ppsocket.h \
+pkginclude_HEADERS = bool.h bufferarray.h bufferstore.h iowatch.h ppsocket.h \
 	rfsv.h rfsv16.h rfsv32.h rfsvfactory.h log.h rpcs32.h rpcs16.h rpcs.h \
 	rpcsfactory.h psitime.h Enum.h
 
diff --git a/plpnfsd/Makefile.am b/plpnfsd/Makefile.am
index 88a45cb..e38762d 100644
--- a/plpnfsd/Makefile.am
+++ b/plpnfsd/Makefile.am
@@ -8,7 +8,7 @@ plpnfsd_SOURCES = mp_main.c mp_mount.c nfs_prot_svc.c nfs_prot_xdr.c \
 	mp_pfs_ops.c mp_inode.c main.cc
 
 EXTRA_plpnfsd_SOURCES = mount_aix.c
-EXTRA_DIST = rfsv_api.h
+EXTRA_DIST = rfsv_api.h builtins.h
 
 install-exec-hook:
 	chmod u+s $(sbindir)/plpnfsd