andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XDARWIN: More fixes to Makefile.am

Browse Source 
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. ;)
This commit is contained in:
Ben Byer 2007-09-19 04:46:10 -07:00
parent 5e209b21f3
commit bcb5e3e627
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/darwin/Makefile.am
View File

@ -8,14 +8,20 @@ INCLUDES = @XORG_INCS@ -I../../miext/rootless
DEFS = @DEFS@ -DUSE_NEW_CLUT DEFS = @DEFS@ -DUSE_NEW_CLUT
if XQUARTZ if XQUARTZ
XQUARTZ_SUBDIRS = bundle quartz XQUARTZ_SUBDIRS = quartz
XQUARTZ_PROGS = Xquartz 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 endif
SUBDIRS = \ SUBDIRS = \
iokit \ iokit \
$(XQUARTZ_SUBDIRS) \ $(XQUARTZ_SUBDIRS) \
$(XDARWINAPP_SUBDIRS) \
utils \ utils \
. .
@ -260,17 +266,19 @@ glxAGL_la_DEPENDENCIES = XDarwinApp
endif endif
endif endif
man1_MANS = XDarwin.man #man1_MANS = XDarwin.man
uninstall-hook: #uninstall-hook:
rm -rf $(DESTDIR)$(macosdir)/XDarwin # rm -rf $(DESTDIR)$(macosdir)/XDarwin
install-data-hook: $(HOOK_TARGETS) install-data-hook: $(XQUARTZ_HOOK) $(XDARWINAPP_HOOK)
xquartz-install-hook: xquartz-install-hook::
mv $(DESTDIR)$(macosdir)/XDarwinApp $(DESTDIR)$(macosdir)/XDarwin
cd apple && xcodebuild install cd apple && xcodebuild install
xdarwinapp-install hook:
mv $(DESTDIR)$(macosdir)/XDarwinApp $(DESTDIR)$(macosdir)/XDarwin
EXTRA_DIST = \ EXTRA_DIST = \
darwin.c \ darwin.c \
darwinClut8.h \ darwinClut8.h \