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:49:32 -0800 |
| commit | 601307615e4955be23fd86a057285074242ad83e (patch) | |
| tree | 390282ad289480514642c90b197a447d22f0308f /hw/darwin/quartz | |
| parent | a344920ae86c1970e4cc34ee91e2f2008d490c49 (diff) | |
| download | xserver-601307615e4955be23fd86a057285074242ad83e.tar.gz | |
Darwin,Rootless: Makefile cleanup
(cherry picked from commit 9c6d8a035b712b219833653ac637b89703a9b0c3)
Diffstat (limited to 'hw/darwin/quartz')
| -rw-r--r-- | hw/darwin/quartz/Makefile.am | 6 | ||||
| -rw-r--r-- | hw/darwin/quartz/xpr/Makefile.am | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/hw/darwin/quartz/Makefile.am b/hw/darwin/quartz/Makefile.am index 54e6c30a7..fe6642983 100644 --- a/hw/darwin/quartz/Makefile.am +++ b/hw/darwin/quartz/Makefile.am @@ -1,8 +1,8 @@ noinst_LIBRARIES = libXQuartz.a -AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) -AM_OBJCFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) -AM_CPPFLAGS = $(XORG_INCS) \ +AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_CPPFLAGS = \ -DHAS_KL_API \ -I$(srcdir) -I$(srcdir)/.. \ -I$(top_srcdir)/miext/rootless diff --git a/hw/darwin/quartz/xpr/Makefile.am b/hw/darwin/quartz/xpr/Makefile.am index 4fe6e23b6..8f482f1dc 100644 --- a/hw/darwin/quartz/xpr/Makefile.am +++ b/hw/darwin/quartz/xpr/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libxpr.a -AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) -AM_CPPFLAGS = $(XORG_INCS) \ +AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_CPPFLAGS = \ -DHAVE_XORG_CONFIG_H \ -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \ -I$(top_srcdir)/miext \ @@ -9,14 +9,14 @@ AM_CPPFLAGS = $(XORG_INCS) \ libxpr_a_SOURCES = \ appledri.c \ - dri.c \ - xprAppleWM.c \ - xprCursor.c \ - xprFrame.c \ - xprScreen.c \ - x-hash.c \ - x-hook.c \ - x-list.c + dri.c \ + xprAppleWM.c \ + xprCursor.c \ + xprFrame.c \ + xprScreen.c \ + x-hash.c \ + x-hook.c \ + x-list.c EXTRA_DIST = \ dri.h \ |