984a75e189
o use internal freetype2 for consistency with x11/XFree86-4. o added xthreads obtained from x11/XFree86-4. o install "ws" type config sample for xdm. o build DRI only if kernel source installed in /sys. o fix Riva128/SGRAM driver(patch-riva_hw.c). PR: 24338(4.0.2) Submitted by: maintainer, keith
135 lines
3.7 KiB
Plaintext
135 lines
3.7 KiB
Plaintext
--- Imakefile.orig Thu Aug 3 22:25:52 2000
|
|
+++ Imakefile Mon Mar 26 03:32:39 2001
|
|
@@ -18,8 +18,32 @@
|
|
#endif
|
|
#endif
|
|
|
|
+#if defined(FreeBSDBuildXlib) && FreeBSDBuildXlib
|
|
+ SUBDIRS = include config lib $(NLSSUBDIR) \
|
|
+ programs/Xserver/include \
|
|
+ programs/Xserver/hw/xfree86/parser \
|
|
+ programs/proxymngr programs/xrx
|
|
+#else
|
|
+#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin
|
|
+ SUBDIRS = include config lib $(NLSSUBDIR) \
|
|
+ programs/Xserver/include programs/Xserver/hw/xfree86/parser \
|
|
+ programs/Xserver/hw/xfree86/dummylib \
|
|
+ programs/Xserver/hw/xfree86/loader \
|
|
+ programs/Xserver/hw/xfree86/xf86cfg \
|
|
+ programs/Xserver/hw/xfree86/os-support \
|
|
+ programs/rgb \
|
|
+ programs \
|
|
+ fonts/util
|
|
+#else
|
|
+#if defined(FreeBSDBuildXfs) && FreeBSDBuildXfs
|
|
+ SUBDIRS = include config lib $(NLSSUBDIR) \
|
|
+ programs programs/xfs
|
|
+#else
|
|
SUBDIRS = include config lib $(NLSSUBDIR) \
|
|
programs $(FONTSDIR) $(DOCSDIR)
|
|
+#endif
|
|
+#endif
|
|
+#endif
|
|
LNINSTALLDIRS = lib
|
|
|
|
#if HasParallelMake
|
|
@@ -210,3 +234,98 @@
|
|
#undef BootstrapCleanSubdirs
|
|
#define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)"
|
|
BOOTSTRAPSUBDIRS = imake makedepend
|
|
+
|
|
+#if defined(BuildXF86DRI) && BuildXF86DRI
|
|
+FreeBSDPortsDRIDir = lib/GL/mesa/src/drv
|
|
+#endif
|
|
+#if defined(FreeBSDBuildXlib) && FreeBSDBuildXlib
|
|
+FreeBSDPortsInstallDir = include lib nls programs/Xserver/include \
|
|
+ programs/xrx/plugin \
|
|
+ programs/Xserver/hw/xfree86/parser
|
|
+#else
|
|
+#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin
|
|
+FreeBSDPortsInstallDir = lib programs programs programs/Xserver/hw/xfree86/xf86cfg fonts/util programs/rgb
|
|
+#else
|
|
+#if defined(FreeBSDBuildXxserv) && FreeBSDBuildXxserv
|
|
+FreeBSDPortsInstallDir = programs lib/font $(FreeBSDPortsDRIDir)
|
|
+#else
|
|
+#if defined(FreeBSDBuildXfs) && FreeBSDBuildXfs
|
|
+FreeBSDPortsInstallDir = programs/xfs
|
|
+#else
|
|
+#if defined(FreeBSDBuildXnest) && FreeBSDBuildXnest
|
|
+FreeBSDPortsInstallDir = programs/Xserver
|
|
+#else
|
|
+FreeBSDPortsInstallDir = $(SUBDIRS)
|
|
+#endif
|
|
+#endif
|
|
+#endif
|
|
+#endif
|
|
+#endif
|
|
+
|
|
+FreeBSDPortsBuild::
|
|
+ @for dir in $(SUBDIRS); do \
|
|
+ (cd $$dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) all); \
|
|
+ done
|
|
+
|
|
+FreeBSDPortsInstall::
|
|
+ @for dir in $(FreeBSDPortsInstallDir); do \
|
|
+ (cd $$dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) install); \
|
|
+ done
|
|
+
|
|
+FreeBSDPortsInstall.man::
|
|
+ @for dir in $(FreeBSDPortsInstallDir); do \
|
|
+ (cd $$dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) install.man); \
|
|
+ done
|
|
+
|
|
+# followings are in XBMPICS and XPMPICS at programs/Xserver/hw/xfree86/xf86cfg
|
|
+XLIBADDFILES1= \
|
|
+ card.xbm\
|
|
+ keyboard.xbm\
|
|
+ monitor.xbm\
|
|
+ mouse.xbm\
|
|
+ left.xbm\
|
|
+ right.xbm\
|
|
+ up.xbm\
|
|
+ down.xbm\
|
|
+ wider.xbm\
|
|
+ narrower.xbm\
|
|
+ shorter.xbm\
|
|
+ taller.xbm
|
|
+XLIBADDFILES2= \
|
|
+ card.xpm\
|
|
+ computer.xpm\
|
|
+ keyboard.xpm\
|
|
+ monitor.xpm\
|
|
+ mouse.xpm
|
|
+
|
|
+installXlib::
|
|
+ (cd programs/proxymngr && \
|
|
+ $(INSTALL) -c $(INSTINCFLAGS) PM.h $(INCROOT)/X11/PM && \
|
|
+ $(INSTALL) -c $(INSTINCFLAGS) PMproto.h $(INCROOT)/X11/PM)
|
|
+ (cd programs/Xserver/hw/xfree86/xf86cfg && \
|
|
+ $(INSTALL) -c $(INSTINCFLAGS) $(XLIBADDFILES1) $(INCROOT)/X11/bitmaps && \
|
|
+ $(INSTALL) -c $(INSTINCFLAGS) $(XLIBADDFILES2) $(INCROOT)/X11/pixmaps)
|
|
+
|
|
+installXnest::
|
|
+ (cd programs/Xserver && \
|
|
+ $(INSTALL) -c $(INSTALLFLAGS) $(INSTPGMFLAGS) Xnest $(DESTDIR)$(BINDIR)/Xnest)
|
|
+
|
|
+installXnest.man::
|
|
+ (cd programs/Xserver/hw/xnest && $(MAKE) install.man)
|
|
+
|
|
+installXprt::
|
|
+ (cd programs/Xserver && \
|
|
+ $(INSTALL) -c $(INSTALLFLAGS) $(INSTPGMFLAGS) Xprt $(DESTDIR)$(BINDIR)/Xprt)
|
|
+
|
|
+installXvfb::
|
|
+ (cd programs/Xserver && \
|
|
+ $(INSTALL) -c $(INSTALLFLAGS) $(INSTPGMFLAGS) Xvfb $(DESTDIR)$(BINDIR)/Xvfb)
|
|
+
|
|
+installXvfb.man::
|
|
+ (cd programs/Xserver/hw/vfb && $(MAKE) install.man)
|
|
+
|
|
+installXserver.man::
|
|
+ (cd programs/Xserver && $(MAKE) install.man)
|
|
+
|
|
+NOOP:
|
|
+ @echo :
|