diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2005-10-05 21:38:40 +0000 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2005-10-05 21:38:40 +0000 |
| commit | dc6ac8e46f80157960a24a1be1fb83f22dff45a0 (patch) | |
| tree | ec677a383f487d84c02a6aa0f8e73d7bf17563e8 /hw | |
| parent | 8391eaa4aa1ae3744ad8c45f5d148ba362d2c9dd (diff) | |
Add DGA configure option and add various files that we should be dist'ing.
Simplify xf86DefModeSet.c rule a bit.
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/vfb/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/xfree86/common/Makefile.am | 11 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/extmod/Makefile.am | 5 |
3 files changed, 11 insertions, 9 deletions
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am index 2c799a5d6..c02319192 100644 --- a/hw/vfb/Makefile.am +++ b/hw/vfb/Makefile.am @@ -23,3 +23,7 @@ AM_CFLAGS = -DHAVE_DIX_CONFIG_H \ -DNO_MODULE_EXTS \ -DXFree86Server \ $(XVFBMODULES_CFLAGS) + +man1_MANS = Xvfb.man + +CLEANFILES = $(man1_MANS) diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am index 9358c8f2f..4b1739192 100644 --- a/hw/xfree86/common/Makefile.am +++ b/hw/xfree86/common/Makefile.am @@ -23,15 +23,10 @@ BUSSOURCES = xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES) KBDSOURCES = xf86Kbd@XORG_OS_KBD@.c MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes -MODEDEFS = modedefs -$(MODEDEFS): $(MODEDEFSOURCES) +xf86DefModeSet.c: $(srcdir)/modeline2c.pl $(RM) $@ - cat $(MODEDEFSOURCES) > $@ - -xf86DefModeSet.c: $(MODEDEFS) $(srcdir)/modeline2c.pl - $(RM) $@ - $(PERL) $(srcdir)/modeline2c.pl < $(MODEDEFS) > $@ + cat $(MODEDEFSOURCES) | $(PERL) $(srcdir)/modeline2c.pl > $@ BUILT_SOURCES = xf86DefModeSet.c @@ -42,7 +37,7 @@ libcommon_a_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \ xf86Globals.c xf86Io.c xf86AutoConfig.c \ xf86MiscExt.c xf86Option.c \ xf86VidMode.c xf86fbman.c xf86cmap.c \ - xf86Helper.c \ + xf86Helper.c xf86PM.c \ xf86Mode.c xf86Build.h xorgHelper.c xf86Versions.c \ $(XVSOURCES) $(BUSSOURCES) $(XKBSOURCES) \ $(DEBUGSOURCES) $(XISOURCES) $(RANDRSOURCES) \ diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am index 6e401786d..fbb07732a 100644 --- a/hw/xfree86/dixmods/extmod/Makefile.am +++ b/hw/xfree86/dixmods/extmod/Makefile.am @@ -2,7 +2,10 @@ sdk_HEADERS = dgaproc.h module_LTLIBRARIES = libextmod.la -# DGA_SRCS = xf86dga.c xf86dga2.c dgaproc.h xf86dgaext.h +if DGA +DGA_SRCS = xf86dga.c xf86dga2.c dgaproc.h xf86dgaext.h +endif + if XV XV_SRCS = xvmod.c xvmodproc.h endif |