Added Gnulib intprops module.

Tidy up Makefile.am.
Add (C) notices.

diff --git a/Makefile.am b/Makefile.am
index ec44f98..a68632b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,25 +1,53 @@
-SUBDIRS = lib
+# PortableXDR - a free, portable XDR implementation.
+# Copyright (C) 2008-2009 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+SUBDIRS = lib
 ACLOCAL_AMFLAGS = -I m4
-
 EXTRA_DIST = m4/gnulib-cache.m4
 
-nobase_include_HEADERS = rpc/rpc.h rpc/types.h rpc/xdr.h
+# Header files, located in $includedir/portablexdr-5/rpc so that
+# they don't conflict with existing SunRPC header files.
+
+nobase_include_HEADERS = \
+       portablexdr-5/rpc/rpc.h \
+       portablexdr-5/rpc/types.h \
+       portablexdr-5/rpc/xdr_internal.h \
+       portablexdr-5/rpc/xdr.h
+
+# The library.
 
 lib_LTLIBRARIES = libportablexdr.la
-libportablexdr_la_SOURCES = xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c \
-       xdr.c xdr_intXX_t.c xdr_rec.c xdr_stdio.c \
-       byteswap.h \
-       rpc/rpc.h rpc/types.h rpc/xdr.h
-libportablexdr_la_CFLAGS = -Wall -Werror -fno-strict-aliasing
+libportablexdr_la_SOURCES = \
+       $(nobase_include_HEADERS)
+libportablexdr_la_CFLAGS = -Wall -Werror
 libportablexdr_la_LDFLAGS = @MINGW_EXTRA_LDFLAGS@
 
-# Replacement 'rpcgen'.  Don't call it 'rpcgen' however so that
-# we can avoid conflicting with the system rpcgen.
+# Replacement 'rpcgen', named portable-rpcgen to avoid any
+# conflicts with existing Sun rpcgen.
+
 BUILT_SOURCES = rpcgen_parse.h
 AM_YFLAGS = -d
 bin_PROGRAMS = portable-rpcgen
-portable_rpcgen_SOURCES = rpcgen_parse.y rpcgen_scan.l \
-       rpcgen_int.h rpcgen_main.c rpcgen_ast.c rpcgen_codegen.c
+portable_rpcgen_SOURCES = \
+       rpcgen_int.h \
+       rpcgen_scan.l \
+       rpcgen_parse.y \
+       rpcgen_ast.c \
+       rpcgen_codegen.c \
+       rpcgen_main.c
 portable_rpcgen_CFLAGS = -Wall
 #portable_rpcgen_CFLAGS += -DYYDEBUG

diff --git a/configure.ac b/configure.ac
index 27b51e8..7fe1ebe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,20 @@
+dnl PortableXDR - a free, portable XDR implementation.
+dnl Copyright (C) 2008-2009 Red Hat Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
 AC_INIT(portablexdr, 4.9.2)
 AM_INIT_AUTOMAKE
 

diff --git a/lib/.gitignore b/lib/.gitignore
index abd3d67..f41cfb4 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -2,3 +2,4 @@
 /dummy.c
 /stdint.in.h
 /wchar.in.h
+/intprops.h

diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index e153a9d..2d3ff74 100644 (file)
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,11 +15,12 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --libtool --macro-prefix=gl stdint
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --libtool --macro-prefix=gl intprops stdint
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
 gl_MODULES([
+  intprops
   stdint
 ])
 gl_AVOID([])