diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-11-24 19:04:08 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-11-24 19:04:08 +0000 |
| commit | a2e50908b04b199c1f13f67586b8ce579419d984 (patch) | |
| tree | 447c4483cb17bb47c29401aefb1a77e6c90b7497 /xserver/hw/kdrive/Makefile.am | |
| parent | 7f7539c63f6c1d8cc96a016edff945871c68638d (diff) | |
merge xserver 1.4, 1st pass
Diffstat (limited to 'xserver/hw/kdrive/Makefile.am')
| -rw-r--r-- | xserver/hw/kdrive/Makefile.am | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/xserver/hw/kdrive/Makefile.am b/xserver/hw/kdrive/Makefile.am index 56e85a059..f6415c932 100644 --- a/xserver/hw/kdrive/Makefile.am +++ b/xserver/hw/kdrive/Makefile.am @@ -1,9 +1,9 @@ if KDRIVEVESA -VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ +VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 \ smi via endif -if KDRIVEFBDEV +if BUILD_KDRIVEFBDEVLIB FBDEV_SUBDIRS = fbdev endif @@ -11,6 +11,10 @@ if KDRIVEWSCONS WSCONS_SUBDIRS = wscons endif +if XFAKESERVER +XFAKE_SUBDIRS = fake +endif + if XSDLSERVER XSDL_SUBDIRS = sdl endif @@ -27,17 +31,23 @@ if KDRIVEOPENBSD OPENBSD_SUBDIRS = openbsd endif -SUBDIRS = \ - src \ - $(LINUX_SUBDIRS) \ - $(OPENBSD_SUBDIRS) \ +SERVER_SUBDIRS = \ $(XSDL_SUBDIRS) \ $(FBDEV_SUBDIRS) \ $(VESA_SUBDIRS) \ $(WSCONS_SUBDIRS) \ $(XEPHYR_SUBDIRS) \ - fake + $(XFAKE_SUBDIRS) + +SUBDIRS = \ + src \ + $(LINUX_SUBDIRS) \ + $(OPENBSD_SUBDIRS) \ + $(SERVER_SUBDIRS) DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ smi via fbdev sdl ephyr src linux fake sis300 \ openbsd wscons + +relink: + @for i in $(SERVER_SUBDIRS) ; do make -C $$i relink ; done |