From 8017087a84402c7af795449341fe4c55118de022 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@cvs.openbsd.org>
Date: Mon, 14 Jan 2013 22:17:02 +0000
Subject: update to xmag 1.0.5

---
 app/xmag/Makefile.am | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'app/xmag/Makefile.am')

diff --git a/app/xmag/Makefile.am b/app/xmag/Makefile.am
index b52bebc06..6c1a81c65 100644
--- a/app/xmag/Makefile.am
+++ b/app/xmag/Makefile.am
@@ -19,10 +19,11 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
+SUBDIRS = man
 bin_PROGRAMS = xmag
 
 AM_CFLAGS = $(XMAG_CFLAGS) $(CWARNFLAGS)
-xmag_LDADD = $(XMAG_LIBS) -lm
+xmag_LDADD = $(XMAG_LIBS)
 
 xmag_SOURCES =	\
         CutPaste.c \
@@ -35,9 +36,6 @@ xmag_SOURCES =	\
         ScaleP.h \
         xmag.c
 
-appman_PRE = \
-        xmag.man
-
 # App default files  (*.ad)
 
 DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
@@ -48,24 +46,9 @@ dist_appdefault_DATA = \
         app-defaults/Xmag
 
 # Developer documentation for Scale widget in Scale.c
-EXTRA_DIST = Scale.txt
-
-EXTRA_DIST += xmag.icon
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+EXTRA_DIST = Scale.txt xmag.icon
 
-EXTRA_DIST += $(appman_PRE)
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(APP_MAN_SUFFIX):
-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
 
 .PHONY: ChangeLog INSTALL
 
-- 
cgit v1.2.3