diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-16 16:32:31 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-16 16:32:31 +0000 |
| commit | e9cda97b38a5987aad2260f5153992d43bec16ce (patch) | |
| tree | 94f0b93f5a343f528bec5474d222a510e4fb9442 /libXdmcp | |
| parent | c59dda05406935ac1aaf11bf8cbd1b3140d8d115 (diff) | |
| parent | f851244b9298d88c29331ab285c2839d8bee6925 (diff) | |
| download | vcxsrv-e9cda97b38a5987aad2260f5153992d43bec16ce.tar.gz vcxsrv-e9cda97b38a5987aad2260f5153992d43bec16ce.tar.bz2 vcxsrv-e9cda97b38a5987aad2260f5153992d43bec16ce.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libXdmcp')
| -rw-r--r-- | libXdmcp/Makefile.am | 132 |
1 files changed, 66 insertions, 66 deletions
diff --git a/libXdmcp/Makefile.am b/libXdmcp/Makefile.am index 118368ee6..3da33e5b8 100644 --- a/libXdmcp/Makefile.am +++ b/libXdmcp/Makefile.am @@ -1,66 +1,66 @@ -SUBDIRS=doc
-
-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)
+SUBDIRS=doc + +lib_LTLIBRARIES = libXdmcp.la + +AM_CPPFLAGS = -I${top_srcdir}/include +AM_CFLAGS = \ + $(XDMCP_CFLAGS) \ + $(CWARNFLAGS) + +libXdmcp_la_LDFLAGS = -export-symbols-regex '^Xdmcp.*' -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) |