diff options
| author | Jeremy Huddleston <jeremy@tifa.local> | 2007-11-21 19:51:14 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremy@tifa.local> | 2007-11-21 19:52:11 -0800 |
| commit | bcbaf2a0ce34b6c5e41d2831b8b87dbd0617a89b (patch) | |
| tree | 064153d76872e4b9674b38e1fec7163d12a61cce /GL | |
| parent | a55ec1a9f4b62139dc5e5462d79d47b330c27c79 (diff) | |
Darwin: Dead code removal, Code cleanup, Added launcher
Imported changes from xorg-server-1.2-apple to make master more current wrt
file layout, build system changes, and dead code removal.
Diffstat (limited to 'GL')
| -rw-r--r-- | GL/Makefile.am | 8 | ||||
| -rw-r--r-- | GL/apple/Makefile.am | 11 |
2 files changed, 11 insertions, 8 deletions
diff --git a/GL/Makefile.am b/GL/Makefile.am index 38cef7b39..29d03f2d6 100644 --- a/GL/Makefile.am +++ b/GL/Makefile.am @@ -1,7 +1,9 @@ -if XDARWIN -DARWIN_SUBDIRS = apple +if XQUARTZ +XQUARTZ_SUBDIRS = apple endif -SUBDIRS = glx mesa $(DARWIN_SUBDIRS) + +SUBDIRS = glx mesa $(XQUARTZ_SUBDIRS) +DIST_SUBDIRS = glx mesa apple WINDOWS_EXTRAS = \ windows/ChangeLog \ diff --git a/GL/apple/Makefile.am b/GL/apple/Makefile.am index 2b2d10cbc..6f0b68d5f 100644 --- a/GL/apple/Makefile.am +++ b/GL/apple/Makefile.am @@ -1,8 +1,9 @@ -AM_CFLAGS = -I$(top_srcdir) \ - -I$(top_srcdir)/hw/darwin/quartz \ - -I$(top_srcdir)/GL/glx \ - -I$(top_srcdir)/hw/darwin/quartz/cr \ - -I$(top_srcdir)/GL/include +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/GL/glx \ + -I$(top_srcdir)/GL/include \ + -I$(top_srcdir)/hw/darwin/quartz \ + -I$(top_srcdir)/hw/darwin/quartz/cr if HAVE_AGL_FRAMEWORK noinst_LIBRARIES = libAGLcore.a |