diff options
| author | Jeremy Huddleston <jeremy@yuffie.local> | 2007-11-26 13:04:57 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremy@yuffie.local> | 2007-11-26 14:11:01 -0800 |
| commit | 2b2df4f5174b5b263942c7fea3a7f84b08f2a996 (patch) | |
| tree | 42de2d4bfd035d2f6f809fa61001c86ed0dcf450 /miext | |
| parent | f3e6d129662d72235a72a6df60a76343d1df055d (diff) | |
Darwin,Rootless: Makefile cleanup
(cherry picked from commit 9c6d8a035b712b219833653ac637b89703a9b0c3)
Diffstat (limited to 'miext')
| -rw-r--r-- | miext/rootless/Makefile.am | 19 | ||||
| -rw-r--r-- | miext/rootless/accel/Makefile.am | 25 | ||||
| -rw-r--r-- | miext/rootless/safeAlpha/Makefile.am | 13 |
3 files changed, 24 insertions, 33 deletions
diff --git a/miext/rootless/Makefile.am b/miext/rootless/Makefile.am index 8dae6d237..aa8528e6a 100644 --- a/miext/rootless/Makefile.am +++ b/miext/rootless/Makefile.am @@ -1,22 +1,19 @@ -AM_CFLAGS = \ - $(DIX_CFLAGS) \ - $(XORG_CFLAGS) - -INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support +AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/hw/xfree86/os-support SUBDIRS = safeAlpha accel noinst_LTLIBRARIES = librootless.la librootless_la_SOURCES = \ rootlessCommon.c \ - rootlessCommon.h \ - rootlessConfig.h \ rootlessGC.c \ - rootless.h \ rootlessScreen.c \ rootlessValTree.c \ - rootlessWindow.c \ - rootlessWindow.h + rootlessWindow.c EXTRA_DIST = \ - README.txt + README.txt \ + rootless.h \ + rootlessCommon.h \ + rootlessConfig.h \ + rootlessWindow.h diff --git a/miext/rootless/accel/Makefile.am b/miext/rootless/accel/Makefile.am index c49d5fb47..ca41653b7 100644 --- a/miext/rootless/accel/Makefile.am +++ b/miext/rootless/accel/Makefile.am @@ -1,18 +1,15 @@ -AM_CFLAGS = \ - $(DIX_CFLAGS) \ - $(XORG_CFLAGS) - -INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/hw/xfree86/os-support - +AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(top_srcdir)/hw/xfree86/os-support noinst_LTLIBRARIES = librlAccel.la -librlAccel_la_SOURCES = rlAccel.c \ - rlBlt.c \ - rlCopy.c \ - rlFill.c \ - rlFillRect.c \ - rlFillSpans.c \ - rlGlyph.c \ - rlSolid.c +librlAccel_la_SOURCES = \ + rlAccel.c \ + rlBlt.c \ + rlCopy.c \ + rlFill.c \ + rlFillRect.c \ + rlFillSpans.c \ + rlGlyph.c \ + rlSolid.c EXTRA_DIST = rlAccel.h diff --git a/miext/rootless/safeAlpha/Makefile.am b/miext/rootless/safeAlpha/Makefile.am index 7592c1840..d26439335 100644 --- a/miext/rootless/safeAlpha/Makefile.am +++ b/miext/rootless/safeAlpha/Makefile.am @@ -1,12 +1,9 @@ -AM_CFLAGS = \ - $(DIX_CFLAGS) \ - $(XORG_CFLAGS) - -INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/hw/xfree86/os-support - +AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I$(top_srcdir)/hw/xfree86/os-support noinst_LTLIBRARIES = libsafeAlpha.la -libsafeAlpha_la_SOURCES = safeAlphaPicture.c \ - safeAlphaWindow.c +libsafeAlpha_la_SOURCES = \ + safeAlphaPicture.c \ + safeAlphaWindow.c EXTRA_DIST = safeAlpha.h |