From f28d4c94798d88757227b8c517a05a6ca354dc6f Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 26 Dec 2010 20:18:03 +0000
Subject: Update to xcalc-1.0.4.1

---
 apps/xcalc/Makefile.am | 60 ++++++++++++++------------------------------------
 1 file changed, 17 insertions(+), 43 deletions(-)

(limited to 'apps/xcalc/Makefile.am')

diff --git a/apps/xcalc/Makefile.am b/apps/xcalc/Makefile.am
index aa0fd9a77..dacb04187 100644
--- a/apps/xcalc/Makefile.am
+++ b/apps/xcalc/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
 # 
 #  Copyright 2005  Red Hat, Inc.
 # 
@@ -22,12 +21,11 @@
 
 bin_PROGRAMS = xcalc
 
-AM_CFLAGS = $(XCALC_CFLAGS)
+AM_CFLAGS = $(XCALC_CFLAGS) $(CWARNFLAGS)
 xcalc_LDADD = $(XCALC_LIBS) -lm
 
 xcalc_SOURCES =	\
         actions.c \
-        actions.h \
         math.c \
         xcalc.c \
         xcalc.h
@@ -37,60 +35,36 @@ appman_PRE = \
 
 # App default files  (*.ad)
 
-appdefaultdir = @appdefaultdir@
-
-
-APPDEFAULTFILES = \
-        XCalc \
-        XCalc-color
-
-SUFFIXES = .ad 
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
 
-.ad:
-	cp $< $@
+appdefaultdir = @appdefaultdir@
 
-appdefault_DATA = $(APPDEFAULTFILES)
+dist_appdefault_DATA = \
+        app-defaults/XCalc \
+        app-defaults/XCalc-color
 
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) ChangeLog autogen.sh
 
-CLEANFILES = $(APPDEFAULTFILES)
 
-MAINTAINERCLEANFILES = ChangeLog
+.PHONY: ChangeLog INSTALL
 
-.PHONY: ChangeLog
+INSTALL:
+	$(INSTALL_CMD)
 
 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
+dist-hook: ChangeLog INSTALL
 
 appmandir = $(APP_MAN_DIR)
 
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 
-EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
-
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xservername__|Xorg|g' \
-	-e 's|__xconfigfile__|xorg.conf|g' \
-	-e 's|__projectroot__|$(prefix)|g' \
-	-e 's|__apploaddir__|$(appdefaultdir)|' \
-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-	-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
-	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+EXTRA_DIST = $(appman_PRE) autogen.sh
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+CLEANFILES = $(appman_DATA)
 
-SUFFIXES += .$(APP_MAN_SUFFIX) .man
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 .man.$(APP_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-- 
cgit v1.2.3