diff --git a/libicbinn/Makefile.am b/libicbinn/Makefile.am index 897d108..e7dec09 100644 --- a/libicbinn/Makefile.am +++ b/libicbinn/Makefile.am @@ -33,21 +33,13 @@ SUBDIRS=. rpc src server client test BUILT_SOURCES=version.h -bin_SCRIPTS = libicbinn-config - pkgconfigdir=${libdir}/pkgconfig pkgconfig_DATA= libicbinn.pc libicbinn.pc.src:libicbinn.pc.src.in -libicbinn.pc:libicbinn.pc.src +libicbinn.pc:libicbinn.pc.src version.sed @SED@ -f version.sed < libicbinn.pc.src > libicbinn.pc || rm -f libicbinn.pc - -libicbinn-config.src:libicbinn-config.src.in -libicbinn-config:libicbinn-config.src version.sed - @SED@ -f version.sed < libicbinn-config.src > libicbinn-config || rm -f libicbinn-config - chmod +x $@ - VNUM=${shell git rev-parse HEAD} do_test: all diff --git a/libicbinn/configure.in b/libicbinn/configure.in index 33d9e84..e0038bc 100644 --- a/libicbinn/configure.in +++ b/libicbinn/configure.in @@ -152,7 +152,5 @@ AC_OUTPUT([Makefile rpc/Makefile server/Makefile client/Makefile - libicbinn.pc.src - libicbinn-config.src], - [chmod +x libicbinn-config.src]) + libicbinn.pc.src]) diff --git a/libicbinn/libicbinn-config.src.in b/libicbinn/libicbinn-config.src.in deleted file mode 100644 index c82cb6e..0000000 --- a/libicbinn/libicbinn-config.src.in +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh -# -# libicbinn-config.src.in: -# -# -# $Id:$ -# -# $Log:$ -# -# -# - -# -# Copyright (c) 2012 Citrix Systems, Inc. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library 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 -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# - - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -exec_prefix_set=no - -usage() -{ - cat <&2 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --version) - echo %VERSION% - exit 0 - ;; - --cflags) - if test "@includedir@" != /usr/include ; then - includes="-I@includedir@" - fi - echo_cflags=yes - ;; - --libs) - echo_libs=yes - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -if test "$echo_prefix" = "yes"; then - echo $prefix -fi -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi -if test "$echo_cflags" = "yes"; then - echo $includes @LIBV4V_CFLAGS@ @LIBTIRPC_CFLAGS@ -fi -if test "$echo_libs" = "yes"; then - echo -L@libdir@ -licbinn @LIBTIRPC_LIBS@ @LIBV4V_LIBS@ -ldl -fi diff --git a/libicbinn/libicbinn.pc.src.in b/libicbinn/libicbinn.pc.src.in index 398aa77..139bb09 100644 --- a/libicbinn/libicbinn.pc.src.in +++ b/libicbinn/libicbinn.pc.src.in @@ -8,4 +8,4 @@ Description: libicbinn Requires: Version: %VERSION% Libs: -L${libdir} -licbinn @LIBTIRPC_LIBS@ @LIBV4V_LIBS@ -ldl -Cflags: -I${includedir} @LIBV4V_CFLAGS@ @LIBTIRPC_CFLAGS@ +Cflags: -I${includedir} diff --git a/libicbinn/rpc/xdr_fixup.c b/libicbinn/rpc/xdr_fixup.c deleted file mode 100644 index e5848c9..0000000 --- a/libicbinn/rpc/xdr_fixup.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2012 Citrix Systems, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include - -/* VILE HACK - rpcgen from libc, specificies to call xdr_quad_t when dealing with hypers */ -/* unfortunately that symbol isn't defined in tirpc - which instead uses xdr_hyper, thus */ -/* we call a confused an unitizalized libc fuction which promptly explodes. Override the */ -/* weak aliases with the correct symbols from libtirpc */ - -bool_t -xdr_quad_t (XDR * x, quad_t * q) -{ - return xdr_hyper (x, q); -} - -bool_t -xdr_u_quad_t (XDR * x, u_quad_t * q) -{ - return xdr_u_hyper (x, q); -} diff --git a/libicbinn/server/Makefile.am b/libicbinn/server/Makefile.am index 4bc9a43..2e38e8f 100644 --- a/libicbinn/server/Makefile.am +++ b/libicbinn/server/Makefile.am @@ -38,7 +38,7 @@ endif DBUS_CLIENT_H=${DBUS_CLIENT_IDLS:%=%_client.h} -PROTOSRCS = server.c svc_main.c util.c dbusrpc.c version.c ../rpc/icbinn_prot_svc.c ../rpc/icbinn_prot_xdr.c ../rpc/xdr_fixup.c +PROTOSRCS = server.c svc_main.c util.c dbusrpc.c version.c ../rpc/icbinn_prot_svc.c ../rpc/icbinn_prot_xdr.c bin_PROGRAMS = icbinn_svc diff --git a/libicbinn/server/prototypes.h b/libicbinn/server/prototypes.h index e9c7ced..6146f3c 100644 --- a/libicbinn/server/prototypes.h +++ b/libicbinn/server/prototypes.h @@ -68,6 +68,3 @@ bool_t xdr_icbinn_prot_ftruncateargs(XDR *xdrs, icbinn_prot_ftruncateargs *objp) bool_t xdr_icbinn_prot_randargs(XDR *xdrs, icbinn_prot_randargs *objp); bool_t xdr_icbinn_prot_randokres(XDR *xdrs, icbinn_prot_randokres *objp); bool_t xdr_icbinn_prot_randres(XDR *xdrs, icbinn_prot_randres *objp); -/* ../rpc/xdr_fixup.c */ -bool_t xdr_quad_t(XDR *x, quad_t *q); -bool_t xdr_u_quad_t(XDR *x, u_quad_t *q); diff --git a/libicbinn/src/Makefile.am b/libicbinn/src/Makefile.am index 8aa4a0d..ae2cb94 100644 --- a/libicbinn/src/Makefile.am +++ b/libicbinn/src/Makefile.am @@ -35,7 +35,7 @@ LIBV4V_LIBS_NO_DL=${LIBV4V_LIBS:-ldl=} PROTOSRCS=client.c close.c lock.c mkdir.c null.c open.c pread.c pwrite.c readdir.c rename.c rmdir.c stat.c unlink.c util.c version.c ftruncate.c fallocate.c rand.c readlink.c symlink.c statfs.c fsync.c canary.c -ICBINNSRCS=../rpc/icbinn_prot_clnt.c ../rpc/icbinn_prot_xdr.c ${PROTOSRCS} ../rpc/xdr_fixup.c +ICBINNSRCS=../rpc/icbinn_prot_clnt.c ../rpc/icbinn_prot_xdr.c ${PROTOSRCS} noinst_HEADERS=project.h prototypes.h icbinn-tail.h ext_prototypes.h diff --git a/libicbinn_resolved/Makefile.am b/libicbinn_resolved/Makefile.am index 85b1502..5c11011 100644 --- a/libicbinn_resolved/Makefile.am +++ b/libicbinn_resolved/Makefile.am @@ -31,21 +31,13 @@ SUBDIRS=. src BUILT_SOURCES=version.h -bin_SCRIPTS = libicbinn_resolved-config - pkgconfigdir=${libdir}/pkgconfig pkgconfig_DATA= libicbinn_resolved.pc libicbinn_resolved.pc.src:libicbinn_resolved.pc.src.in -libicbinn_resolved.pc:libicbinn_resolved.pc.src +libicbinn_resolved.pc:libicbinn_resolved.pc.src version.sed @SED@ -f version.sed < libicbinn_resolved.pc.src > libicbinn_resolved.pc || rm -f libicbinn_resolved.pc - -libicbinn_resolved-config.src:libicbinn_resolved-config.src.in -libicbinn_resolved-config:libicbinn_resolved-config.src version.sed - @SED@ -f version.sed < libicbinn_resolved-config.src > libicbinn_resolved-config || rm -f libicbinn_resolved-config - chmod +x $@ - VNUM=${shell git rev-parse HEAD} version.sed: never-happy diff --git a/libicbinn_resolved/configure.in b/libicbinn_resolved/configure.in index 0722d68..0c29b64 100644 --- a/libicbinn_resolved/configure.in +++ b/libicbinn_resolved/configure.in @@ -104,7 +104,5 @@ AC_SUBST(RPCGEN_TEMPLATES) AC_OUTPUT([Makefile src/Makefile - libicbinn_resolved.pc.src - libicbinn_resolved-config.src], - [chmod +x libicbinn_resolved-config.src]) + libicbinn_resolved.pc.src]) diff --git a/libicbinn_resolved/libicbinn_resolved-config.src.in b/libicbinn_resolved/libicbinn_resolved-config.src.in deleted file mode 100644 index 513c49d..0000000 --- a/libicbinn_resolved/libicbinn_resolved-config.src.in +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh -# -# libicbinn-config.src.in: -# -# -# $Id:$ -# -# $Log:$ -# -# -# - -# -# Copyright (c) 2012 Citrix Systems, Inc. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library 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 -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# - - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -exec_prefix_set=no - -usage() -{ - cat <&2 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --version) - echo %VERSION% - exit 0 - ;; - --cflags) - if test "@includedir@" != /usr/include ; then - includes="-I@includedir@" - fi - echo_cflags=yes - ;; - --libs) - echo_libs=yes - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -if test "$echo_prefix" = "yes"; then - echo $prefix -fi -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi -if test "$echo_cflags" = "yes"; then - echo $includes @LIBV4V_CFLAGS@ @LIBTIRPC_CFLAGS@ -fi -if test "$echo_libs" = "yes"; then - echo -L@libdir@ -licbinn_resolved -ldl -fi diff --git a/libicbinn_resolved/libicbinn_resolved.pc.src.in b/libicbinn_resolved/libicbinn_resolved.pc.src.in index 1f9e97e..b545b67 100644 --- a/libicbinn_resolved/libicbinn_resolved.pc.src.in +++ b/libicbinn_resolved/libicbinn_resolved.pc.src.in @@ -8,4 +8,4 @@ Description: libicbinn_resolved Requires: Version: %VERSION% Libs: -L${libdir} -licbinn_resolved -ldl -Cflags: -I${includedir} @LIBICBINN_CFLAGS@ +Cflags: -I${includedir}