From 2cc4bdad59cbb32cc4d363b437ee0c4fa44b148b Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Fri, 6 May 2005 01:46:31 +0000 Subject: Initial build system files for proto module. --- Makefile.am | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Makefile.am (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..7c5da3e --- /dev/null +++ b/Makefile.am @@ -0,0 +1,10 @@ +panoramixdir = $(includedir)/X11/extensions +panoramix_HEADERS = \ + panoramiXext.h \ + panoramiXproto.h \ + Xinerama.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = panoramixext.pc + +EXTRA_DIST = autogen.sh panoramixext.pc.in -- cgit v1.2.3 From 2d1fbdb4b20e9c12cf7c6c1872d5fd888f39e390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Mon, 9 May 2005 18:20:05 +0000 Subject: Change all the protonames from Ext to Proto. --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 7c5da3e..7c2950f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,6 @@ panoramix_HEADERS = \ Xinerama.h pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = panoramixext.pc +pkgconfig_DATA = panoramixproto.pc -EXTRA_DIST = autogen.sh panoramixext.pc.in +EXTRA_DIST = autogen.sh panoramixproto.pc.in -- cgit v1.2.3 From aba421a2e74a326a0e4387d3173308735a6263fd Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 18 Aug 2005 23:38:59 +0000 Subject: Xinerama protocol module should be named Xinerama, not Panoramix --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 7c2950f..9320e38 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ -panoramixdir = $(includedir)/X11/extensions -panoramix_HEADERS = \ +xineramadir = $(includedir)/X11/extensions +xinerama_HEADERS = \ panoramiXext.h \ panoramiXproto.h \ Xinerama.h pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = panoramixproto.pc +pkgconfig_DATA = xineramaproto.pc -EXTRA_DIST = autogen.sh panoramixproto.pc.in +EXTRA_DIST = autogen.sh xineramaproto.pc.in -- cgit v1.2.3 From 29a5de547f301b8b3af265d87889ba08ef3a5c8e Mon Sep 17 00:00:00 2001 From: James Cloos Date: Thu, 6 Dec 2007 16:39:15 -0500 Subject: Replace static ChangeLog with dist-hook to generate from git log --- Makefile.am | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 9320e38..9254d26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,3 +8,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xineramaproto.pc EXTRA_DIST = autogen.sh xineramaproto.pc.in + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog -- cgit v1.2.3 From e28d33b35a0a795aec7e3174b42a0f317c15a827 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 19 May 2008 22:40:07 +0930 Subject: Remove panoramiXext.h and Xinerama.h. Xlib headers and don't belong here. For furture amendmends to these files please refer to git://anongit.freedesktop.org/git/xorg/lib/libXinerama --- Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 9254d26..d00df00 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,6 @@ xineramadir = $(includedir)/X11/extensions xinerama_HEADERS = \ - panoramiXext.h \ - panoramiXproto.h \ - Xinerama.h + panoramiXproto.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xineramaproto.pc -- cgit v1.2.3 From b8b3878351a148e527df44ddf8886917f00d1a85 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Tue, 27 Jan 2009 20:06:28 -0200 Subject: Janitor: Correct make distcheck and dont distribute autogen.sh --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index d00df00..591a301 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ xinerama_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xineramaproto.pc -EXTRA_DIST = autogen.sh xineramaproto.pc.in +EXTRA_DIST = xineramaproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -13,6 +13,6 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog -- cgit v1.2.3 From 5c15d5e22cdbb9ce16bc989729eabff2ee6ec6bd Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 18:31:29 -0500 Subject: Makefile.am: INSTALL file is missing or incorrect #24206 The standard GNU file on building/installing tarball is copied using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS Add INSTALL target --- Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 591a301..0787d11 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,9 +10,12 @@ EXTRA_DIST = xineramaproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL -- cgit v1.2.3 From 714187d975e09664b2b949287bc8b8c3cc802f33 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 19:45:27 -0500 Subject: Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 ChangeLog filename is known to Automake and requires no further coding in the makefile. --- Makefile.am | 3 --- 1 file changed, 3 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 0787d11..7388efa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,9 +7,6 @@ pkgconfig_DATA = xineramaproto.pc EXTRA_DIST = xineramaproto.pc.in -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog - .PHONY: ChangeLog INSTALL INSTALL: -- cgit v1.2.3 From 51e0e392e34e543fadb873a1a1e15c01f96cc538 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 22 Nov 2009 19:24:48 -0500 Subject: Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 7388efa..d087acc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,8 @@ pkgconfig_DATA = xineramaproto.pc EXTRA_DIST = xineramaproto.pc.in +MAINTAINERCLEANFILES = ChangeLog INSTALL + .PHONY: ChangeLog INSTALL INSTALL: -- cgit v1.2.3 From bbf13fdf9259886403347c4fd6f127bed0af4426 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 28 Mar 2010 19:00:31 -0400 Subject: config: remove the pkgconfig pc.in file from EXTRA_DIST Automake always includes it in the tarball. Signed-off-by: Gaetan Nadon --- Makefile.am | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index d087acc..92a4911 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,6 @@ xinerama_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xineramaproto.pc -EXTRA_DIST = xineramaproto.pc.in MAINTAINERCLEANFILES = ChangeLog INSTALL -- cgit v1.2.3