initial libtoolization for libpkgconf

Makefile.am

@@ -9,6 +9,7 @@ pkgconfigdir           = @PKGCONFIGDIR@
 CFLAGS = -Wall -Wextra -Wformat=2 -std=gnu99
 
 bin_PROGRAMS = pkgconf
+lib_LTLIBRARIES = libpkgconf.la
 
 EXTRA_DIST =	\
 		tests/lib1/argv-parse-2.pc \
@@ -50,10 +51,22 @@ EXTRA_DIST =	\
 		tests/lib1/conflicts.pc \
 		tests/lib1/omg-uninstalled.pc
 
-noinst_HEADERS = bsdstubs.h getopt_long.h iter.h pkg.h stdinc.h
+pkginclude_HEADERS = libpkgconf/bsdstubs.h libpkgconf/iter.h libpkgconf/libpkgconf.h libpkgconf/stdinc.h
-pkgconf_SOURCES  = main.c cache.c pkg.c bsdstubs.c getopt_long.c fragment.c argvsplit.c fileio.c tuple.c dependency.c queue.c
+libpkgconf_la_SOURCES  =	\
-pkgconf_CPPFLAGS = -DLIBDIR=\"${libdir}\" -DINCLUDEDIR=\"${includedir}\" -DPKG_DEFAULT_PATH=\"${pkgconfigdir}\" -DSYSTEM_INCLUDEDIR=\"${system_includedir}\" -DSYSTEM_LIBDIR=\"${system_libdir}\"
+		libpkgconf/cache.c		\
+		libpkgconf/pkg.c		\
+		libpkgconf/bsdstubs.c		\
+		libpkgconf/fragment.c		\
+		libpkgconf/argvsplit.c		\
+		libpkgconf/fileio.c		\
+		libpkgconf/tuple.c		\
+		libpkgconf/dependency.c		\
+		libpkgconf/queue.c
+libpkgconf_la_LDFLAGS = -version-info 1:0:0
+
 pkgconf_MANS     = pkgconf.1
+pkgconf_LDADD    = libpkgconf.la
+pkgconf_SOURCES  = main.c getopt_long.c
 
 dist_doc_DATA = README.md AUTHORS
 

autogen.sh

@@ -12,6 +12,7 @@ AUTOCONF=${AUTOCONF:-autoconf}
 ACLOCAL=${ACLOCAL:-aclocal}
 AUTOHEADER=${AUTOHEADER:-autoheader}
 AUTOMAKE=${AUTOMAKE:-automake}
+LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
 
 dump_help_screen ()
 {
@@ -82,4 +83,5 @@ cd $TOP_DIR
 run_or_die $ACLOCAL
 run_or_die $AUTOHEADER
 run_or_die $AUTOCONF
+run_or_die $LIBTOOLIZE --install
 run_or_die $AUTOMAKE --add-missing

configure.ac

@@ -13,10 +13,11 @@ dnl from the use of this software.
 
 AC_PREREQ([2.68])
 AC_INIT([pkgconf], [1], [http://github.com/pkgconf/pkgconf/issues])
-AC_CONFIG_SRCDIR([pkg.c])
+AC_CONFIG_SRCDIR([main.c])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([libpkgconf/config.h])
 AC_CHECK_FUNCS([strlcpy strlcat strndup strtok_r])
-AM_INIT_AUTOMAKE([foreign dist-xz])
+AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects])
+LT_INIT
 
 AC_SYS_LARGEFILE
 
@@ -55,6 +56,10 @@ AC_ARG_WITH([system-includedir],[AC_HELP_STRING([--with-system-includedir],[spec
 
 AC_SUBST([SYSTEM_INCLUDEDIR])
 
+AC_DEFINE_UNQUOTED([SYSTEM_LIBDIR], "$SYSTEM_LIBDIR", [System library directory list])
+AC_DEFINE_UNQUOTED([SYSTEM_INCLUDEDIR], "$SYSTEM_INCLUDEDIR", [System include directory list])
+AC_DEFINE_UNQUOTED([PKG_DEFAULT_PATH], "$PKGCONFIGDIR", [Default PKG_CONFIG_PATH search list])
+
 AC_PROG_CPP
 AC_PROG_CC
 AC_PROG_INSTALL

install-sh

@@ -1,323 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2005-05-14.22
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-chmodcmd="$chmodprog 0755"
-chowncmd=
-chgrpcmd=
-stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
-dstarg=
-no_target_directory=
-
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
-
-while test -n "$1"; do
-  case $1 in
-    -c) shift
-        continue;;
-
-    -d) dir_arg=true
-        shift
-        continue;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
-
-    -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
-
-    -T) no_target_directory=true
-	shift
-	continue;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
-	break;;
-  esac
-done
-
-if test -z "$1"; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src ;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
-  else
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dstarg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dstarg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst ;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
-	exit 1
-      fi
-      dst=$dst/`basename "$src"`
-    fi
-  fi
-
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
-  # Make sure that the destination directory exists.
-
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
-
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
-
-    pathcomp=
-
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
-      shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
-      fi
-      pathcomp=$pathcomp/
-    done
-  fi
-
-  if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
-  else
-    dstfile=`basename "$dst"`
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
-
-    # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-	 }
-    }
-  fi || { (exit 1); exit 1; }
-done
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

libpkgconf/argvsplit.c

@@ -13,8 +13,7 @@
  * from the use of this software.
  */
 
-#include "config.h"
+#include <libpkgconf/libpkgconf.h>
-#include "pkg.h"
 
 void
 pkg_argv_free(char **argv)

libpkgconf/bsdstubs.c

@@ -20,8 +20,8 @@
 #include <sys/types.h>
 #include <string.h>
 
-#include "bsdstubs.h"
+#include <libpkgconf/bsdstubs.h>
-#include "config.h"
+#include <libpkgconf/config.h>
 
 #ifndef HAVE_STRLCPY
 

libpkgconf/bsdstubs.h

@@ -13,8 +13,7 @@
  * from the use of this software.
  */
 
-#include "config.h"
+#include <libpkgconf/config.h>
-#include "getopt_long.h"
 
 #ifndef __BSDSTUBS_H__
 #define __BSDSTUBS_H__

libpkgconf/cache.c

@@ -13,7 +13,7 @@
  * from the use of this software.
  */
 
-#include "pkg.h"
+#include <libpkgconf/libpkgconf.h>
 
 static pkg_list_t pkg_cache = PKG_LIST_INITIALIZER;
 

libpkgconf/dependency.c

@@ -13,8 +13,7 @@
  * from the use of this software.
  */
 
-#include "pkg.h"
+#include <libpkgconf/libpkgconf.h>
-#include "bsdstubs.h"
 
 /*
  * pkg_dependency_parse(pkg, depends)

libpkgconf/fileio.c

@@ -13,8 +13,7 @@
  * from the use of this software.
  */
 
-#include "pkg.h"
+#include <libpkgconf/libpkgconf.h>
-#include "bsdstubs.h"
 
 char *
 pkg_fgetline(char *line, size_t size, FILE *stream)

libpkgconf/fragment.c

@@ -13,8 +13,7 @@
  * from the use of this software.
  */
 
-#include "pkg.h"
+#include <libpkgconf/libpkgconf.h>
-#include "bsdstubs.h"
 
 static inline char *
 pkg_fragment_copy_munged(const char *source, unsigned int flags)

libpkgconf/libpkgconf.h

@@ -16,9 +16,10 @@
 #ifndef __PKG_H
 #define __PKG_H
 
-#include "config.h"
+#include <libpkgconf/config.h>
-#include "stdinc.h"
+#include <libpkgconf/stdinc.h>
-#include "iter.h"
+#include <libpkgconf/iter.h>
+#include <libpkgconf/bsdstubs.h>
 
 #define PKG_BUFSIZE	(65535)
 

libpkgconf/pkg.c

@@ -13,8 +13,7 @@
  * from the use of this software.
  */
 
-#include "pkg.h"
+#include <libpkgconf/libpkgconf.h>
-#include "bsdstubs.h"
 
 #ifdef _WIN32
 #	define PKG_CONFIG_REG_KEY "Software\\pkgconfig\\PKG_CONFIG_PATH"

libpkgconf/queue.c

@@ -13,8 +13,7 @@
  * from the use of this software.
  */
 
-#include "pkg.h"
+#include <libpkgconf/libpkgconf.h>
-#include "bsdstubs.h"
 
 typedef struct {
 	pkg_node_t iter;

libpkgconf/tuple.c

@@ -13,8 +13,7 @@
  * from the use of this software.
  */
 
-#include "pkg.h"
+#include <libpkgconf/libpkgconf.h>
-#include "bsdstubs.h"
 
 static pkg_list_t pkg_global_var = PKG_LIST_INITIALIZER;
 

main.c

@@ -13,9 +13,8 @@
  * from the use of this software.
  */
 
-#include "config.h"
+#include <libpkgconf/libpkgconf.h>
-#include "pkg.h"
+#include "getopt_long.h"
-#include "bsdstubs.h"
 
 #define PKG_CFLAGS_ONLY_I		(uint64_t)(1<<2)
 #define PKG_CFLAGS_ONLY_OTHER		(uint64_t)(1<<3)