diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-20 14:23:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-20 14:23:37 +0000 |
| commit | 684eb992146cad24b690073f33b909f47150b841 (patch) | |
| tree | 7bc62d6f06c5e8a8114b56fa78485cb7ec08f26b /xorg-server/miext | |
| parent | 53810445215dc45ae303bc89feb6e0aaf04aa6fa (diff) | |
| parent | 8a191c08ddda2e66fa26f148d6c21959bb08f923 (diff) | |
| download | vcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.gz vcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.bz2 vcxsrv-684eb992146cad24b690073f33b909f47150b841.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/miext')
| -rw-r--r-- | xorg-server/miext/damage/Makefile.am | 28 | ||||
| -rw-r--r-- | xorg-server/miext/rootless/Makefile.am | 33 | ||||
| -rw-r--r-- | xorg-server/miext/shadow/Makefile.am | 66 |
3 files changed, 62 insertions, 65 deletions
diff --git a/xorg-server/miext/damage/Makefile.am b/xorg-server/miext/damage/Makefile.am index 595835731..9f858a8e5 100644 --- a/xorg-server/miext/damage/Makefile.am +++ b/xorg-server/miext/damage/Makefile.am @@ -1,14 +1,14 @@ -noinst_LTLIBRARIES = libdamage.la - -AM_CFLAGS = $(DIX_CFLAGS) - -INCLUDES = -I$(srcdir)/../cw -I$(top_srcdir)/hw/xfree86/os-support - -if XORG -sdk_HEADERS = damage.h damagestr.h -endif - -libdamage_la_SOURCES = \ - damage.c \ - damage.h \ - damagestr.h +noinst_LTLIBRARIES = libdamage.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+INCLUDES = -I$(srcdir)/../cw
+
+if XORG
+sdk_HEADERS = damage.h damagestr.h
+endif
+
+libdamage_la_SOURCES = \
+ damage.c \
+ damage.h \
+ damagestr.h
diff --git a/xorg-server/miext/rootless/Makefile.am b/xorg-server/miext/rootless/Makefile.am index f09300d5c..72d299bcc 100644 --- a/xorg-server/miext/rootless/Makefile.am +++ b/xorg-server/miext/rootless/Makefile.am @@ -1,17 +1,16 @@ -AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS) -AM_CPPFLAGS = -I$(top_srcdir)/hw/xfree86/os-support - -noinst_LTLIBRARIES = librootless.la -librootless_la_SOURCES = \ - rootlessCommon.c \ - rootlessGC.c \ - rootlessScreen.c \ - rootlessValTree.c \ - rootlessWindow.c - -EXTRA_DIST = \ - README.txt \ - rootless.h \ - rootlessCommon.h \ - rootlessConfig.h \ - rootlessWindow.h +AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS)
+
+noinst_LTLIBRARIES = librootless.la
+librootless_la_SOURCES = \
+ rootlessCommon.c \
+ rootlessGC.c \
+ rootlessScreen.c \
+ rootlessValTree.c \
+ rootlessWindow.c
+
+EXTRA_DIST = \
+ README.txt \
+ rootless.h \
+ rootlessCommon.h \
+ rootlessConfig.h \
+ rootlessWindow.h
diff --git a/xorg-server/miext/shadow/Makefile.am b/xorg-server/miext/shadow/Makefile.am index a73d0ec78..59cee7f59 100644 --- a/xorg-server/miext/shadow/Makefile.am +++ b/xorg-server/miext/shadow/Makefile.am @@ -1,34 +1,32 @@ -noinst_LTLIBRARIES = libshadow.la - -AM_CFLAGS = $(DIX_CFLAGS) - -INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support - -if XORG -sdk_HEADERS = shadow.h -endif - -libshadow_la_SOURCES = \ - shadow.c \ - shadow.h \ - shalloc.c \ - shpacked.c \ - shplanar8.c \ - shplanar.c \ - shrot16pack_180.c \ - shrot16pack_270.c \ - shrot16pack_270YX.c \ - shrot16pack_90.c \ - shrot16pack_90YX.c \ - shrot16pack.c \ - shrot32pack_180.c \ - shrot32pack_270.c \ - shrot32pack_90.c \ - shrot32pack.c \ - shrot8pack_180.c \ - shrot8pack_270.c \ - shrot8pack_90.c \ - shrot8pack.c \ - shrotate.c \ - shrotpack.h \ - shrotpackYX.h +noinst_LTLIBRARIES = libshadow.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+if XORG
+sdk_HEADERS = shadow.h
+endif
+
+libshadow_la_SOURCES = \
+ shadow.c \
+ shadow.h \
+ shalloc.c \
+ shpacked.c \
+ shplanar8.c \
+ shplanar.c \
+ shrot16pack_180.c \
+ shrot16pack_270.c \
+ shrot16pack_270YX.c \
+ shrot16pack_90.c \
+ shrot16pack_90YX.c \
+ shrot16pack.c \
+ shrot32pack_180.c \
+ shrot32pack_270.c \
+ shrot32pack_90.c \
+ shrot32pack.c \
+ shrot8pack_180.c \
+ shrot8pack_270.c \
+ shrot8pack_90.c \
+ shrot8pack.c \
+ shrotate.c \
+ shrotpack.h \
+ shrotpackYX.h
|