diff options
| author | Ben Byer <bbyer@bbyer.local> | 2007-09-19 04:46:10 -0700 |
|---|---|---|
| committer | Ben Byer <bbyer@bbyer.local> | 2007-09-19 04:46:10 -0700 |
| commit | bcb5e3e6276ce9ae7a4dae7434cf2247764da078 (patch) | |
| tree | c2c2f4468fe96922fd156bf3387c6bcbe5e97b02 /hw | |
| parent | 5e209b21f3d6b3268fa7dab1e8df892d8352cc08 (diff) | |
XDARWIN: More fixes to Makefile.am
At least on my system (10.5 with the latest and greatest modules),
Xquartz now builds out of the box. It doesn't quite work yet, but
hey -- you have to start somewhere. ;)
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/darwin/Makefile.am | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am index 1a2fa2184..72bee4ae4 100644 --- a/hw/darwin/Makefile.am +++ b/hw/darwin/Makefile.am @@ -8,14 +8,20 @@ INCLUDES = @XORG_INCS@ -I../../miext/rootless DEFS = @DEFS@ -DUSE_NEW_CLUT if XQUARTZ -XQUARTZ_SUBDIRS = bundle quartz +XQUARTZ_SUBDIRS = quartz XQUARTZ_PROGS = Xquartz -HOOK_TARGETS = xquartz-install-hook +XQUARTZ_HOOK = xquartz-install-hook +endif + +if XDARWINAPP +XDARWINAPP_SUBDIRS = bundle +XDARWINAPP_HOOK = xdarwinapp-install-hook endif SUBDIRS = \ iokit \ $(XQUARTZ_SUBDIRS) \ + $(XDARWINAPP_SUBDIRS) \ utils \ . @@ -260,17 +266,19 @@ glxAGL_la_DEPENDENCIES = XDarwinApp endif endif -man1_MANS = XDarwin.man +#man1_MANS = XDarwin.man -uninstall-hook: - rm -rf $(DESTDIR)$(macosdir)/XDarwin +#uninstall-hook: +# rm -rf $(DESTDIR)$(macosdir)/XDarwin -install-data-hook: $(HOOK_TARGETS) +install-data-hook: $(XQUARTZ_HOOK) $(XDARWINAPP_HOOK) -xquartz-install-hook: - mv $(DESTDIR)$(macosdir)/XDarwinApp $(DESTDIR)$(macosdir)/XDarwin +xquartz-install-hook:: cd apple && xcodebuild install +xdarwinapp-install hook: + mv $(DESTDIR)$(macosdir)/XDarwinApp $(DESTDIR)$(macosdir)/XDarwin + EXTRA_DIST = \ darwin.c \ darwinClut8.h \ |