From 02960d805a4fd4a359bd0c7e4d33b9ce32d68c82 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mon, 14 May 2007 12:17:52 +0000 Subject: [PATCH] * Introduce FOO-uninstalled.pc files for both libgphoto2 and libgphoto2_port. * Move FOO.pc to the top source directory. * Get rid of obsolete GP_AUTOGEN_SUBDIR macro. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10199 67ed7778-7388-44ab-90cf-0a291f65f57c --- Makefile.am | 6 ++++++ configure.ac | 4 ++-- libgphoto2/libgphoto2.pc.in => libgphoto2.pc.in | 0 libgphoto2/Makefile.am | 5 +---- libgphoto2_port/Makefile.am | 7 +++++++ libgphoto2_port/configure.ac | 3 ++- .../{libgphoto2_port => }/libgphoto2_port.pc.in | 0 libgphoto2_port/libgphoto2_port/Makefile.am | 4 +--- 8 files changed, 19 insertions(+), 10 deletions(-) rename libgphoto2/libgphoto2.pc.in => libgphoto2.pc.in (100%) rename libgphoto2_port/{libgphoto2_port => }/libgphoto2_port.pc.in (100%) diff --git a/Makefile.am b/Makefile.am index be4c159d4..b8c57a461 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,6 +10,12 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() SUBDIRS = @subdirs@ libgphoto2 camlibs tests po packaging doc +EXTRA_DIST += libgphoto2.pc.in +pkgconfig_DATA = libgphoto2.pc + +EXTRA_DIST += libgphoto2-uninstalled.pc.in +noinst_DATA = libgphoto2-uninstalled.pc + doc_DATA = AUTHORS COPYING README NEWS nobase_include_HEADERS = \ diff --git a/configure.ac b/configure.ac index f639b2d6f..ec70d540b 100644 --- a/configure.ac +++ b/configure.ac @@ -580,7 +580,6 @@ dnl Configure subprojects dnl --------------------------------------------------------------------------- if test -d "$srcdir/libgphoto2_port"; then AC_CONFIG_SUBDIRS([libgphoto2_port]) - GP_AUTOGEN_SUBDIR([libgphoto2_port]) else AC_MSG_ERROR([ *** Hey, where have you hidden my libgphoto2_port? @@ -600,7 +599,8 @@ camlibs/Makefile camlibs/canon/doc/Makefile camlibs/konica/localization/Makefile libgphoto2/Makefile -libgphoto2/libgphoto2.pc +libgphoto2.pc +libgphoto2-uninstalled.pc tests/Makefile tests/check-camera-list.sh tests/ddb/Makefile diff --git a/libgphoto2/libgphoto2.pc.in b/libgphoto2.pc.in similarity index 100% rename from libgphoto2/libgphoto2.pc.in rename to libgphoto2.pc.in diff --git a/libgphoto2/Makefile.am b/libgphoto2/Makefile.am index 66d8c8ce1..d69670a20 100644 --- a/libgphoto2/Makefile.am +++ b/libgphoto2/Makefile.am @@ -52,9 +52,6 @@ libgphoto2_la_DEPENDENCIES = \ $(srcdir)/libgphoto2.sym \ $(LIBLTDL) -pkgconfig_DATA = libgphoto2.pc - -EXTRA_DIST = libgphoto2.pc.in gphoto2-library.c libgphoto2.sym +EXTRA_DIST = gphoto2-library.c libgphoto2.sym DISTCLEANFILES = _stdint.h - diff --git a/libgphoto2_port/Makefile.am b/libgphoto2_port/Makefile.am index 5d58958f8..f7af31e37 100644 --- a/libgphoto2_port/Makefile.am +++ b/libgphoto2_port/Makefile.am @@ -25,6 +25,13 @@ doc_DATA = AUTHORS README NEWS ACLOCAL_AMFLAGS = -I auto-m4 -I m4 +EXTRA_DIST += libgphoto2_port.pc.in +pkgconfig_DATA = libgphoto2_port.pc + +EXTRA_DIST += libgphoto2_port-uninstalled.pc.in +noinst_DATA = libgphoto2_port-uninstalled.pc + + # ship headers nobase_include_HEADERS = \ gphoto2/gphoto2-port.h \ diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac index 139f2363a..170c53819 100644 --- a/libgphoto2_port/configure.ac +++ b/libgphoto2_port/configure.ac @@ -443,7 +443,8 @@ AC_CONFIG_FILES([ Makefile po/Makefile.in libgphoto2_port/Makefile -libgphoto2_port/libgphoto2_port.pc +libgphoto2_port.pc +libgphoto2_port-uninstalled.pc serial/Makefile usb/Makefile disk/Makefile diff --git a/libgphoto2_port/libgphoto2_port/libgphoto2_port.pc.in b/libgphoto2_port/libgphoto2_port.pc.in similarity index 100% rename from libgphoto2_port/libgphoto2_port/libgphoto2_port.pc.in rename to libgphoto2_port/libgphoto2_port.pc.in diff --git a/libgphoto2_port/libgphoto2_port/Makefile.am b/libgphoto2_port/libgphoto2_port/Makefile.am index 4794bdb83..d936fa3da 100644 --- a/libgphoto2_port/libgphoto2_port/Makefile.am +++ b/libgphoto2_port/libgphoto2_port/Makefile.am @@ -56,9 +56,7 @@ libgphoto2_port_la_DEPENDENCIES = \ # be the result of tar not creating archives with >99 # characters of path length. EXTRA_DIST = \ - libgphoto2_port.sym libgphoto2_port.pc.in - -pkgconfig_DATA = libgphoto2_port.pc + libgphoto2_port.sym ../libltdl/libltdlc.la: cd ../libltdl && $(MAKE) libltdlc.la