aboutsummaryrefslogtreecommitdiff
path: root/libXdmcp/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-27 07:45:26 +0000
committermarha <marha@users.sourceforge.net>2010-05-27 07:45:26 +0000
commit9b02c06e9c08d3d537d0a6fed3304b2146d49511 (patch)
treebe6f1d6ff9c52670c60c4cf556b508357fadd174 /libXdmcp/Makefile.am
parent619d6f3626f36af85cc40eeee95c7585d906fe5c (diff)
parenteb2f17e30a4b9c79dc78d520e0e0334b99984d50 (diff)
downloadvcxsrv-9b02c06e9c08d3d537d0a6fed3304b2146d49511.tar.gz
vcxsrv-9b02c06e9c08d3d537d0a6fed3304b2146d49511.tar.bz2
vcxsrv-9b02c06e9c08d3d537d0a6fed3304b2146d49511.zip
svn merge ^/branches/released .
Diffstat (limited to 'libXdmcp/Makefile.am')
-rw-r--r--libXdmcp/Makefile.am156
1 files changed, 64 insertions, 92 deletions
diff --git a/libXdmcp/Makefile.am b/libXdmcp/Makefile.am
index e419649db..4dfd0453a 100644
--- a/libXdmcp/Makefile.am
+++ b/libXdmcp/Makefile.am
@@ -1,92 +1,64 @@
-lib_LTLIBRARIES = libXdmcp.la
-
-AM_CFLAGS=-I${top_srcdir}/include $(XDMCP_CFLAGS)
-libXdmcp_la_LDFLAGS = -version-number 6:0:0 -no-undefined
-libXdmcp_la_LIBADD = $(XDMCP_LIBS)
-libXdmcp_la_SOURCES = \
- A8Eq.c \
- AA16.c \
- AA32.c \
- AA8.c \
- Alloc.c \
- AofA8.c \
- CA8.c \
- CmpKey.c \
- DA16.c \
- DA32.c \
- DA8.c \
- DAofA8.c \
- DecKey.c \
- Fill.c \
- Flush.c \
- GenKey.c \
- IncKey.c \
- RA16.c \
- RA32.c \
- RA8.c \
- RAofA8.c \
- RC16.c \
- RC32.c \
- RC8.c \
- RHead.c \
- RR.c \
- RaA16.c \
- RaA32.c \
- RaA8.c \
- RaAoA8.c \
- Unwrap.c \
- WA16.c \
- WA32.c \
- WA8.c \
- WAofA8.c \
- WC16.c \
- WC32.c \
- WC8.c \
- Whead.c \
- Wrap.c \
- Wrap.h
-
-if HASXDMAUTH
-nodist_libXdmcp_la_SOURCES = Wraphelp.c
-endif HASXDMAUTH
-
-xdmcpincludedir=$(includedir)/X11
-
-INCLUDES = \
- -I${top_builddir}/include
-
-xdmcpinclude_HEADERS = \
- include/X11/Xdmcp.h
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xdmcp.pc
-
-EXTRA_DIST = xdmcp.pc.in autogen.sh Wraphelp.c Wraphelp.README.crypto
-
-if LINT
-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
-
-lint:
- $(LINT) $(ALL_LINT_FLAGS) $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES) $(LIBS) $(XDMCP_LIBS)
-endif LINT
-
-if MAKE_LINT_LIB
-lintlibdir = $(libdir)
-
-lintlib_DATA = $(LINTLIB)
-
-$(LINTLIB): $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES)
- $(LINT) -y -oXdmcp -x $(ALL_LINT_FLAGS) $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES)
-endif MAKE_LINT_LIB
-
-MAINTAINERCLEANFILES=ChangeLog
-
-.PHONY: ChangeLog
-
-ChangeLog:
- $(CHANGELOG_CMD)
-
-dist-hook: ChangeLog
-
-CLEANFILES=$(lintlib_DATA)
+lib_LTLIBRARIES = libXdmcp.la
+
+AM_CPPFLAGS = -I${top_srcdir}/include
+AM_CFLAGS = \
+ $(XDMCP_CFLAGS) \
+ $(CWARNFLAGS)
+
+libXdmcp_la_LDFLAGS = -version-number 6:0:0 -no-undefined
+libXdmcp_la_LIBADD = $(XDMCP_LIBS)
+libXdmcp_la_SOURCES = \
+ Array.c \
+ Fill.c \
+ Flush.c \
+ Key.c \
+ Read.c \
+ Unwrap.c \
+ Wrap.c \
+ Wrap.h \
+ Write.c
+
+if HASXDMAUTH
+nodist_libXdmcp_la_SOURCES = Wraphelp.c
+endif HASXDMAUTH
+
+xdmcpincludedir=$(includedir)/X11
+
+xdmcpinclude_HEADERS = \
+ include/X11/Xdmcp.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xdmcp.pc
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+EXTRA_DIST = autogen.sh Wraphelp.c Wraphelp.README.crypto
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES) $(LIBS) $(XDMCP_LIBS)
+endif LINT
+
+if MAKE_LINT_LIB
+lintlibdir = $(libdir)
+
+lintlib_DATA = $(LINTLIB)
+
+$(LINTLIB): $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES)
+ $(LINT) -y -oXdmcp -x $(ALL_LINT_FLAGS) $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES)
+endif MAKE_LINT_LIB
+
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
+
+CLEANFILES=$(lintlib_DATA)