From patchwork Thu Jul 5 14:42:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Reisner X-Patchwork-Id: 671 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 3E35254596F5 for ; Thu, 5 Jul 2018 14:43:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on apollo X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,MAILING_LIST_MULTI=-1, RCVD_IN_DNSWL_MED=-2.3,T_DKIMWL_WL_HIGH=-0.01 autolearn=ham autolearn_force=no version=3.4.1 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Thu, 5 Jul 2018 14:43:09 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 5A57FBAD18E24; Thu, 5 Jul 2018 14:43:02 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS; Thu, 5 Jul 2018 14:43:02 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 3A3A72BDF5; Thu, 5 Jul 2018 14:43:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1530801782; bh=5AryoVbWN1BidCBbfc/WehNFO+B/+hPf5l1qxQaMAb4=; h=From:To:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Reply-To:Cc; b=vL68WlpkMgf1booCWjwFp0G6BKEcgtCdN4hoVT0YztMGgeCN1FkNatlK9jhHlwyEG yVXSeCTEqiIGNBwLoV81ZSYIk28fFZRlLc8r5IZCMNE5Q46RHrrpdxfgIaIB1AkXui vcDx/8BeNjrQ9rARhE7vdojebRMgctTRCfxHj8mhazml0HhbjLBdaioqZ5dQuAxCPc RTMHh36yfgbYrW1XyVrDy9rvmvDdwg/EzlD6AsG77ftEEexIE0BTdmP1QT9bPzKc25 +ZcRmuxy/H0x1V9NPGb5sdnlLtISzaQBgfxF8AXDr4LVLuaWynCdFrkywnic7aK5Jo QFqFLtHUwKIxlOCyi6Z0CeW890l1Y6ZZQGw0JL/ky3QcPnicNP1meinloZMLOwhpxm 2BC/CqyRTwbTqP701RX64BA7LwEIwjFmdYPOjZs2ZvSdR+Oqa17Juu4MbHZfhRtYVl i1qJNGB1mzlLXU3AzdaB22jNSDD+03sHkSy+yQFWweyTX1aUq4wNXu2rFGllY6iaeZ Rc5JrboziBOZrBjmSa9FNlffnpM0T7zWah31hjNxyJUBlNBvzU1sfULl2qnK1Jq2l4 KPQcdWFaHYw1S5GbAR8EeraKnlRUFEh1KfFKkGk8fUk5CupwQgYnbVWc/2mmXggDDs NxQLcTbvK+u6QYKtSQFWBpNE= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 72BF82B34C for ; Thu, 5 Jul 2018 14:43:00 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Thu, 5 Jul 2018 14:43:00 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id D5223BAD18E0A; Thu, 5 Jul 2018 14:42:51 +0000 (UTC) Received: from localhost (unknown [IPv6:2604:2000:1406:11:309a:eca6:7ba1:ff59]) (using TLSv1.2 with cipher DHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) (Authenticated sender: dreisner) by orion.archlinux.org (Postfix) with ESMTPSA id 6FF9ABAD18E09; Thu, 5 Jul 2018 14:42:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1530801771; bh=5AryoVbWN1BidCBbfc/WehNFO+B/+hPf5l1qxQaMAb4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=b3rF7v7XOTeMXkRPnoa5jIlJvw6luCmJWLkXPcQuspK0qwIqxCOmZ7ea1FKr+67GR 0eXnhb2AMvmJvCGYpK/QbnqdMeO6VN+Xq1K7+kVMqgDVHdXE7TC7s247+aJi7b5J+w V0lzM1+Ubsv9iAIHv6VDIy2nRRKclQB4UdgHzSN3mKfMkWVlcfHFenh4dPWIBknANW buYBu4Fq0T19xB7X6RnGyTngCX9cKpFe0FmkErrPZdCyV7ViVi1lTXPPi7ocnvL1QM DddthpgDa/UOZ8yXm4ObAtPYgzQTjoou9NqBfs+uDux9DAFGJkeLeqP+8cq6a1Ny7C POlPzrfyXatqOVf4PEoQ1j2ExNd0UcZ0WB+w9M6wO9onx7SrhhoRsVPBLtHY24SKwC YdHHi6qH1GS9bKvaTnBIQNMawgZWbFmp3WNxjm+t6g/hm/lWiK18fbLgsJHWUGJKv0 Sl5YCYpE0grp/zEqUNKWHbGxpKR+qL+Q2XOW4pV0AZhl2ZtB+dOHnh1HbUyBvbSKZy 5CHTYvCL7SLgiDEASWS14fY6ggtSuWDAqXQ1i/XwsxiLqCsbECdAhTU7ydNczl5HTb xqLwv2Qld9SHZCBCQ1p+6HX6jIC9lbndQ0snjnPsLlRckozqc5+bg1Nc4VKvil5DKM GNwcSlYh39uz68cAiu/aafwo= From: Dave Reisner To: pacman-dev@archlinux.org Date: Thu, 5 Jul 2018 10:42:42 -0400 Message-Id: <20180705144244.15619-2-dreisner@archlinux.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180705144244.15619-1-dreisner@archlinux.org> References: <20180705144244.15619-1-dreisner@archlinux.org> Subject: [pacman-dev] [PATCH 2/4] Create a convenience library for reused functionality X-BeenThere: pacman-dev@archlinux.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Discussion list for pacman development Cc: Dave Reisner Errors-To: pacman-dev-bounces@archlinux.org Sender: "pacman-dev" This is shared between pacman and pacman-conf (and might be used by other binaries in the future) -- no need to compile it once for each consumer. --- src/pacman/.gitignore | 3 ++- src/pacman/Makefile.am | 37 +++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/pacman/.gitignore b/src/pacman/.gitignore index 24e11ed3..9889c35e 100644 --- a/src/pacman/.gitignore +++ b/src/pacman/.gitignore @@ -1,6 +1,7 @@ .deps .libs +*.l[ao] pacman pacman.exe pacman-conf -pacman-conf.exe \ No newline at end of file +pacman-conf.exe diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 2344daff..15cf20ce 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -8,6 +8,19 @@ hookdir = ${sysconfdir}/pacman.d/hooks/ cachedir = ${localstatedir}/cache/pacman/pkg/ logfile = ${localstatedir}/log/pacman.log +noinst_LTLIBRARIES = \ + libbasic.la + +libbasic_la_SOURCES = \ + conf.h conf.c \ + ini.h ini.c \ + callback.h callback.c \ + util.h util.c \ + util-common.h util-common.c + +libbasic_la_LIBADD = \ + $(top_builddir)/lib/libalpm/.libs/libalpm.la + bin_PROGRAMS = pacman pacman-conf AM_CPPFLAGS = \ @@ -31,37 +44,25 @@ endif pacman_SOURCES = \ check.h check.c \ - conf.h conf.c \ database.c \ deptest.c \ files.c \ - ini.h ini.c \ package.h package.c \ pacman.h pacman.c \ query.c \ remove.c \ sighandler.h sighandler.c \ sync.c \ - callback.h callback.c \ - upgrade.c \ - util.h util.c \ - util-common.h util-common.c + upgrade.c pacman_LDADD = \ $(LTLIBINTL) \ + libbasic.la \ $(top_builddir)/lib/libalpm/.libs/libalpm.la \ $(LIBARCHIVE_LIBS) -pacman_conf_SOURCES = pacman-conf.c \ - util.h \ - util.c \ - ini.h \ - ini.c \ - util-common.h \ - util-common.c \ - callback.h \ - callback.c \ - conf.h \ - conf.c +pacman_conf_SOURCES = pacman-conf.c -pacman_conf_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la +pacman_conf_LDADD = \ + libbasic.la \ + $(top_builddir)/lib/libalpm/.libs/libalpm.la