svn merge ^/branches/released .

1 files changed, 46 insertions, 60 deletions

diff --git a/apps/xwininfo/Makefile.am b/apps/xwininfo/Makefile.am
index 16e47d7dd..2204b3486 100644
--- a/apps/xwininfo/Makefile.am
+++ b/apps/xwininfo/Makefile.am
@@ -1,60 +1,46 @@
-# 
-#  Copyright 2005  Red Hat, Inc.
-# 
-#  Permission to use, copy, modify, distribute, and sell this software and its
-#  documentation for any purpose is hereby granted without fee, provided that
-#  the above copyright notice appear in all copies and that both that
-#  copyright notice and this permission notice appear in supporting
-#  documentation, and that the name of Red Hat not be used in
-#  advertising or publicity pertaining to distribution of the software without
-#  specific, written prior permission.  Red Hat makes no
-#  representations about the suitability of this software for any purpose.  It
-#  is provided "as is" without express or implied warranty.
-# 
-#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-#  PERFORMANCE OF THIS SOFTWARE.
-
-bin_PROGRAMS = xwininfo
-
-AM_CFLAGS = $(CWARNFLAGS) $(XWININFO_CFLAGS)
-xwininfo_LDADD = $(XWININFO_LIBS) $(LIBOBJS)
-
-xwininfo_SOURCES =	\
-        clientwin.c \
-        clientwin.h \
-        dsimple.c \
-        dsimple.h \
-        xwininfo.c
-
-appman_PRE = \
-        xwininfo.man
-
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST = $(appman_PRE) autogen.sh strnlen.h
-MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
-
-.PHONY: ChangeLog INSTALL
-
-INSTALL:
-	$(INSTALL_CMD)
-
-ChangeLog:
-	$(CHANGELOG_CMD)
-
-dist-hook: ChangeLog INSTALL
-
-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) < $< > $@
+# 

+#  Copyright 2005  Red Hat, Inc.

+# 

+#  Permission to use, copy, modify, distribute, and sell this software and its

+#  documentation for any purpose is hereby granted without fee, provided that

+#  the above copyright notice appear in all copies and that both that

+#  copyright notice and this permission notice appear in supporting

+#  documentation, and that the name of Red Hat not be used in

+#  advertising or publicity pertaining to distribution of the software without

+#  specific, written prior permission.  Red Hat makes no

+#  representations about the suitability of this software for any purpose.  It

+#  is provided "as is" without express or implied warranty.

+# 

+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+#  PERFORMANCE OF THIS SOFTWARE.

+

+SUBDIRS = man

+bin_PROGRAMS = xwininfo

+

+AM_CFLAGS = $(CWARNFLAGS) $(XWININFO_CFLAGS)

+xwininfo_LDADD = $(XWININFO_LIBS) $(LIBOBJS)

+

+xwininfo_SOURCES =	\

+        clientwin.c \

+        clientwin.h \

+        dsimple.c \

+        dsimple.h \

+        xwininfo.c

+

+EXTRA_DIST = strnlen.h

+MAINTAINERCLEANFILES = ChangeLog INSTALL

+

+.PHONY: ChangeLog INSTALL

+

+INSTALL:

+	$(INSTALL_CMD)

+

+ChangeLog:

+	$(CHANGELOG_CMD)

+

+dist-hook: ChangeLog INSTALL