1 files changed, 93 insertions, 88 deletions
diff --git a/libXau/Makefile.am b/libXau/Makefile.am
index 01e24149d..3ff7c03a9 100644
--- a/libXau/Makefile.am
+++ b/libXau/Makefile.am
@@ -1,88 +1,93 @@
-lib_LTLIBRARIES = libXau.la
-
-AM_CFLAGS = $(XAU_CFLAGS)
-
-INCLUDES = -I${top_srcdir}/include
-
-libXau_la_LDFLAGS = -version-number 6:0:0 -no-undefined
-
-libXau_la_LIBADD = $(XAU_LIBS)
-
-libXau_la_SOURCES = \
-	AuDispose.c \
-	AuFileName.c \
-	AuGetAddr.c \
-	AuGetBest.c \
-	AuLock.c \
-	AuRead.c \
-	AuUnlock.c \
-	AuWrite.c
-
-xauincludedir=$(includedir)/X11
-
-xauinclude_HEADERS = include/X11/Xauth.h
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xau.pc
-
-check_PROGRAMS=Autest
-TESTS=Autest
-
-Autest_SOURCES=Autest.c
-Autest_LDADD=libXau.la
-
-if LINT
-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-		$(AM_CPPFLAGS) $(CPPFLAGS)
-
-lint:
-	$(LINT) $(ALL_LINT_FLAGS) $(libXau_la_SOURCES)
-endif LINT
-
-if MAKE_LINT_LIB
-lintlibdir = $(libdir)
-
-lintlib_DATA = $(LINTLIB)
-
-$(LINTLIB): $(libXau_la_SOURCES)
-	$(LINT) -y -oXau -x $(ALL_LINT_FLAGS) $(libXau_la_SOURCES)
-endif MAKE_LINT_LIB
-
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-
-libmandir = $(LIB_MAN_DIR)
-libman_PRE = Xau.man
-BUILT_SOURCES = $(Xau_shadows:=.@LIB_MAN_SUFFIX@)
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) $(lintlib_DATA)
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
-	      $(Xau_shadows:=.@LIB_MAN_SUFFIX@)
-
-EXTRA_DIST = xau.pc.in $(libman_PRE) ChangeLog
-
-Xau_shadows =                               \
-    XauFileName                             \
-    XauReadAuth                             \
-    XauLockAuth                             \
-    XauUnlockAuth                           \
-    XauWriteAuth                            \
-    XauDisposeAuth                          \
-    XauGetAuthByAddr                        \
-    XauGetBestAuthByAddr
-
-Xau_shadows_man = $(Xau_shadows:=.@LIB_MAN_SUFFIX@)
-$(Xau_shadows_man):
-	echo .so man$(LIB_MAN_DIR_SUFFIX)/Xau.$(LIB_MAN_SUFFIX) > $@
-
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-Xau.$(LIB_MAN_SUFFIX): $(srcdir)/Xau.man
-	sed 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
-	< $(srcdir)/Xau.man > Xau.$(LIB_MAN_SUFFIX)
-
-.PHONY: ChangeLog
-
-ChangeLog:
-	$(CHANGELOG_CMD)
-
-dist-hook: ChangeLog
+lib_LTLIBRARIES = libXau.la
+
+AM_CFLAGS = $(XAU_CFLAGS) $(CWARNFLAGS)
+
+INCLUDES = -I${top_srcdir}/include
+
+libXau_la_LDFLAGS = -version-number 6:0:0 -no-undefined
+
+libXau_la_LIBADD = $(XAU_LIBS)
+
+libXau_la_SOURCES = \
+	AuDispose.c \
+	AuFileName.c \
+	AuGetAddr.c \
+	AuGetBest.c \
+	AuLock.c \
+	AuRead.c \
+	AuUnlock.c \
+	AuWrite.c
+
+xauincludedir=$(includedir)/X11
+
+xauinclude_HEADERS = include/X11/Xauth.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xau.pc
+
+check_PROGRAMS=Autest
+TESTS=Autest
+
+Autest_SOURCES=Autest.c
+Autest_LDADD=libXau.la
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+		$(AM_CPPFLAGS) $(CPPFLAGS)
+
+lint:
+	$(LINT) $(ALL_LINT_FLAGS) $(libXau_la_SOURCES)
+endif LINT
+
+if MAKE_LINT_LIB
+lintlibdir = $(libdir)
+
+lintlib_DATA = $(LINTLIB)
+
+$(LINTLIB): $(libXau_la_SOURCES)
+	$(LINT) -y -oXau -x $(ALL_LINT_FLAGS) $(libXau_la_SOURCES)
+endif MAKE_LINT_LIB
+
+LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
+
+libmandir = $(LIB_MAN_DIR)
+libman_PRE = Xau.man
+BUILT_SOURCES = $(Xau_shadows:=.@LIB_MAN_SUFFIX@)
+CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) $(lintlib_DATA)
+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
+	      $(Xau_shadows:=.@LIB_MAN_SUFFIX@)
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+EXTRA_DIST = $(libman_PRE)
+
+Xau_shadows =                               \
+    XauFileName                             \
+    XauReadAuth                             \
+    XauLockAuth                             \
+    XauUnlockAuth                           \
+    XauWriteAuth                            \
+    XauDisposeAuth                          \
+    XauGetAuthByAddr                        \
+    XauGetBestAuthByAddr
+
+Xau_shadows_man = $(Xau_shadows:=.@LIB_MAN_SUFFIX@)
+$(Xau_shadows_man):
+	$(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xau.$(LIB_MAN_SUFFIX) > $@
+
+XORGRELSTRING = @PACKAGE_STRING@
+  XORGMANNAME = X Version 11
+
+Xau.$(LIB_MAN_SUFFIX): $(srcdir)/Xau.man
+	$(AM_V_GEN)$(SED) \
+		-e 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
+	< $(srcdir)/Xau.man > Xau.$(LIB_MAN_SUFFIX)
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL