[hotssh] build: Use Makefile-decls.am from ostree
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [hotssh] build: Use Makefile-decls.am from ostree
- Date: Fri, 3 Jan 2014 16:44:22 +0000 (UTC)
commit 5dba6c234b82166d58e2b27df3b65718b8c82b92
Author: Colin Walters <walters verbum org>
Date: Fri Jan 3 11:44:01 2014 -0500
build: Use Makefile-decls.am from ostree
Makefile-decls.am | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 39 +++++----------------------------------
2 files changed, 56 insertions(+), 34 deletions(-)
---
diff --git a/Makefile-decls.am b/Makefile-decls.am
new file mode 100644
index 0000000..cd28ba2
--- /dev/null
+++ b/Makefile-decls.am
@@ -0,0 +1,51 @@
+# Copyright (C) 2011,2014 Colin Walters <walters verbum org>
+#
+# 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 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., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Common variables
+ACLOCAL_AMFLAGS =
+AM_CPPFLAGS =
+AM_CFLAGS =
+DISTCHECK_CONFIGURE_FLAGS =
+SUBDIRS =
+NULL =
+BUILT_SOURCES =
+MANPAGES =
+CLEANFILES =
+EXTRA_DIST =
+bin_PROGRAMS =
+sbin_PROGRAMS =
+bin_SCRIPTS =
+lib_LTLIBRARIES =
+libexec_PROGRAMS =
+noinst_LTLIBRARIES =
+noinst_PROGRAMS =
+privlibdir = $(pkglibdir)
+privlib_LTLIBRARIES =
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA =
+INTROSPECTION_GIRS =
+girdir = $(datadir)/gir-1.0
+gir_DATA =
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA =
+gsettings_SCHEMAS =
+# git.mk
+GITIGNOREFILES =
+
+# This is a special facility to chain together hooks easily
+INSTALL_DATA_HOOKS =
+install-data-hook: $(INSTALL_DATA_HOOKS)
diff --git a/Makefile.am b/Makefile.am
index 9b69a22..67e938c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,41 +15,14 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-AM_CPPFLAGS = -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"'
-AM_CFLAGS = $(WARN_CFLAGS)
+include Makefile-decls.am
-# Subdirectories
-SUBDIRS =
-
-# Common variables
-NULL =
-INSTALL_DATA_HOOKS =
-BUILT_SOURCES =
-MANPAGES =
-CLEANFILES =
-EXTRA_DIST =
-bin_PROGRAMS =
-sbin_PROGRAMS =
-bin_SCRIPTS =
-lib_LTLIBRARIES =
-libexec_PROGRAMS =
-noinst_LTLIBRARIES =
-noinst_PROGRAMS =
-privlibdir = $(pkglibdir)
-privlib_LTLIBRARIES =
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA =
-INTROSPECTION_GIRS =
-girdir = $(datadir)/gir-1.0
-gir_DATA =
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA =
-gsettings_SCHEMAS =
+ACLOCAL_AMFLAGS += -I m4 ${ACLOCAL_FLAGS}
+AM_CPPFLAGS += -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"'
+AM_CFLAGS += $(WARN_CFLAGS)
EXTRA_DIST += autogen.sh COPYING
-
-GITIGNOREFILES = aclocal.m4 build-aux config.h.in m4
+GITIGNOREFILES += aclocal.m4 build-aux config.h.in m4
libgsystem_srcpath := libgsystem
libgsystem_cflags = $(BUILDDEP_GIO_UNIX_CFLAGS) -I$(srcdir)/libgsystem
@@ -60,8 +33,6 @@ noinst_LTLIBRARIES += libgsystem.la
include Makefile-libgssh.am
include Makefile-src.am
-install-data-hook: $(INSTALL_DATA_HOOKS)
-
release-tag:
git tag -m "Release $(VERSION)" v$(VERSION)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]