diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-08 08:36:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-08 08:36:18 +0000 |
| commit | 29c7981777a6fa7d962977d2a7bdce68c116206d (patch) | |
| tree | 78ed3f1b4d5c559fa6fa0e8fc3dbdc51c8c1f321 /libXinerama/src/Makefile.am | |
| parent | c23b5379fd9f4da7bcd627e973abb6868274fc75 (diff) | |
| parent | d1e8cd61e0fa02a5b415a5c161b355c95f45ae14 (diff) | |
| download | vcxsrv-29c7981777a6fa7d962977d2a7bdce68c116206d.tar.gz vcxsrv-29c7981777a6fa7d962977d2a7bdce68c116206d.tar.bz2 vcxsrv-29c7981777a6fa7d962977d2a7bdce68c116206d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libXinerama/src/Makefile.am')
| -rw-r--r-- | libXinerama/src/Makefile.am | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/libXinerama/src/Makefile.am b/libXinerama/src/Makefile.am index 3efc11136..cac6fd6d0 100644 --- a/libXinerama/src/Makefile.am +++ b/libXinerama/src/Makefile.am @@ -1,25 +1,27 @@ -AM_CFLAGS = -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/X11 \ - -I$(top_srcdir)/include/X11/extensions \ - $(XINERAMA_CFLAGS) \ - $(MALLOC_ZERO_CFLAGS) -lib_LTLIBRARIES = libXinerama.la - -libXinerama_la_SOURCES = \ - Xinerama.c - -libXinerama_la_LIBADD = $(XINERAMA_LIBS) - -libXinerama_la_LDFLAGS = -version-number 1:0:0 -no-undefined - -libXineramaincludedir = $(includedir)/X11/extensions -libXineramainclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xinerama.h \ - $(top_srcdir)/include/X11/extensions/panoramiXext.h - -if LINT -ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) - -lint: - $(LINT) $(ALL_LINT_FLAGS) $(libXinerama_la_SOURCES) $(XINERAMA_LIBS) -endif LINT +AM_CFLAGS = -I$(top_srcdir)/include \
+ -I$(top_srcdir)/include/X11 \
+ -I$(top_srcdir)/include/X11/extensions \
+ $(XINERAMA_CFLAGS) \
+ $(MALLOC_ZERO_CFLAGS) \
+ $(CWARNFLAGS)
+
+lib_LTLIBRARIES = libXinerama.la
+
+libXinerama_la_SOURCES = \
+ Xinerama.c
+
+libXinerama_la_LIBADD = $(XINERAMA_LIBS)
+
+libXinerama_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+
+libXineramaincludedir = $(includedir)/X11/extensions
+libXineramainclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xinerama.h \
+ $(top_srcdir)/include/X11/extensions/panoramiXext.h
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(libXinerama_la_SOURCES) $(XINERAMA_LIBS)
+endif LINT
|