diff --git a/ChangeLog b/ChangeLog index 135e2e762..393ec86ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2005-10-07 Kevin E. Martin + + * configure.ac: + * hw/Makefile.am: + * hw/darwin/Makefile.am: + Add darwin to dist + + * hw/xfree86/doc/Makefile.am: + * hw/xfree86/doc/devel/Makefile.am: + Include missing docs in EXTRA_DIST + + * hw/xwin/Makefile.am: + Include headers and other files in dist + 2005-10-07 Kevin E. Martin * xkb/Makefile.am: diff --git a/configure.ac b/configure.ac index 4ac1732af..a9926818d 100644 --- a/configure.ac +++ b/configure.ac @@ -1228,6 +1228,7 @@ hw/dmx/Makefile hw/vfb/Makefile hw/xnest/Makefile hw/xwin/Makefile +hw/darwin/Makefile Xprint/Makefile Xprint/doc/Makefile Xprint/pcl/Makefile diff --git a/hw/Makefile.am b/hw/Makefile.am index 863649b69..054d7b8ba 100644 --- a/hw/Makefile.am +++ b/hw/Makefile.am @@ -18,6 +18,8 @@ if XWIN XWIN_SUBDIRS = xwin endif +# need to add darwin support here + SUBDIRS = \ $(XORG_SUBDIRS) \ $(XWIN_SUBDIRS) \ @@ -25,4 +27,4 @@ SUBDIRS = \ $(XNEST_SUBDIRS) \ $(DMX_SUBDIRS) -DIST_SUBDIRS = dmx xfree86 vfb xnest xwin +DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am new file mode 100644 index 000000000..133ef5612 --- /dev/null +++ b/hw/darwin/Makefile.am @@ -0,0 +1,122 @@ +DIST_EXTRA = \ + bundle/Dutch.lproj/Credits.rtf \ + bundle/Dutch.lproj/Localizable.strings \ + bundle/Dutch.lproj/MainMenu.nib/classes.nib \ + bundle/Dutch.lproj/MainMenu.nib/objects.nib \ + bundle/Dutch.lproj/XDarwinHelp.html.cpp \ + bundle/English.lproj/Credits.rtf \ + bundle/English.lproj/InfoPlist.strings.cpp \ + bundle/English.lproj/Localizable.strings \ + bundle/English.lproj/MainMenu.nib/classes.nib \ + bundle/English.lproj/MainMenu.nib/objects.nib \ + bundle/English.lproj/XDarwinHelp.html.cpp \ + bundle/French.lproj/Credits.rtf \ + bundle/French.lproj/Localizable.strings \ + bundle/French.lproj/MainMenu.nib/classes.nib \ + bundle/French.lproj/MainMenu.nib/objects.nib \ + bundle/French.lproj/XDarwinHelp.html.cpp \ + bundle/German.lproj/Credits.rtf \ + bundle/German.lproj/Localizable.strings \ + bundle/German.lproj/MainMenu.nib/classes.nib \ + bundle/German.lproj/MainMenu.nib/objects.nib \ + bundle/German.lproj/XDarwinHelp.html.cpp \ + bundle/Japanese.lproj/Credits.rtf \ + bundle/Japanese.lproj/Localizable.strings \ + bundle/Japanese.lproj/MainMenu.nib/classes.nib \ + bundle/Japanese.lproj/MainMenu.nib/objects.nib \ + bundle/Japanese.lproj/XDarwinHelp.html.cpp \ + bundle/ko.lproj/Credits.rtf \ + bundle/ko.lproj/Localizable.strings \ + bundle/ko.lproj/MainMenu.nib/classes.nib \ + bundle/ko.lproj/MainMenu.nib/objects.nib \ + bundle/ko.lproj/XDarwinHelp.html.cpp \ + bundle/Portuguese.lproj/Credits.rtf \ + bundle/Portuguese.lproj/Localizable.strings \ + bundle/Portuguese.lproj/MainMenu.nib/classes.nib \ + bundle/Portuguese.lproj/MainMenu.nib/objects.nib \ + bundle/Portuguese.lproj/XDarwinHelp.html.cpp \ + bundle/Spanish.lproj/Credits.rtf \ + bundle/Spanish.lproj/Localizable.strings \ + bundle/Spanish.lproj/MainMenu.nib/classes.nib \ + bundle/Spanish.lproj/MainMenu.nib/objects.nib \ + bundle/Spanish.lproj/XDarwinHelp.html.cpp \ + bundle/startXClients.cpp \ + bundle/Swedish.lproj/Credits.rtf \ + bundle/Swedish.lproj/Localizable.strings \ + bundle/Swedish.lproj/MainMenu.nib/classes.nib \ + bundle/Swedish.lproj/MainMenu.nib/objects.nib \ + bundle/Swedish.lproj/XDarwinHelp.html.cpp \ + bundle/XDarwin.icns \ + darwin.c \ + darwinClut8.h \ + darwinEvents.c \ + darwin.h \ + darwinKeyboard.c \ + darwinKeyboard.h \ + darwinXinput.c \ + iokit/.cvsignore \ + iokit/xfIOKit.c \ + iokit/xfIOKitCursor.c \ + iokit/xfIOKit.h \ + iokit/xfIOKitStartup.c \ + Makefile.am \ + quartz/applewm.c \ + quartz/applewmExt.h \ + quartz/cr/crAppleWM.m \ + quartz/cr/crFrame.m \ + quartz/cr/cr.h \ + quartz/cr/crScreen.m \ + quartz/cr/.cvsignore \ + quartz/cr/XView.h \ + quartz/cr/XView.m \ + quartz/.cvsignore \ + quartz/fullscreen/.cvsignore \ + quartz/fullscreen/fullscreen.c \ + quartz/fullscreen/quartzCursor.c \ + quartz/fullscreen/quartzCursor.h \ + quartz/keysym2ucs.c \ + quartz/keysym2ucs.h \ + quartz/Preferences.h \ + quartz/Preferences.m \ + quartz/pseudoramiX.c \ + quartz/pseudoramiX.h \ + quartz/quartzAudio.c \ + quartz/quartzAudio.h \ + quartz/quartz.c \ + quartz/quartzCocoa.m \ + quartz/quartzCommon.h \ + quartz/quartzCursor.c \ + quartz/quartzCursor.h \ + quartz/quartz.h \ + quartz/quartzKeyboard.c \ + quartz/quartzPasteboard.c \ + quartz/quartzPasteboard.h \ + quartz/quartzStartup.c \ + quartz/XApplication.h \ + quartz/XApplication.m \ + quartz/XDarwin.pbproj/project.pbxproj \ + quartz/XDarwinStartup.c \ + quartz/XDarwinStartup.man \ + quartz/xpr/appledri.c \ + quartz/xpr/.cvsignore \ + quartz/xpr/dri.c \ + quartz/xpr/dri.h \ + quartz/xpr/dristruct.h \ + quartz/xpr/x-hash.c \ + quartz/xpr/x-hash.h \ + quartz/xpr/x-hook.c \ + quartz/xpr/x-hook.h \ + quartz/xpr/x-list.c \ + quartz/xpr/x-list.h \ + quartz/xpr/Xplugin.h \ + quartz/xpr/xprAppleWM.c \ + quartz/xpr/xprCursor.c \ + quartz/xpr/xprFrame.c \ + quartz/xpr/xpr.h \ + quartz/xpr/xprScreen.c \ + quartz/XServer.h \ + quartz/XServer.m \ + utils/dumpkeymap.c \ + utils/dumpkeymap.man \ + utils/README.txt \ + XDarwin.man diff --git a/hw/xfree86/doc/Makefile.am b/hw/xfree86/doc/Makefile.am index e7d8d8be0..2bb75008e 100644 --- a/hw/xfree86/doc/Makefile.am +++ b/hw/xfree86/doc/Makefile.am @@ -1 +1,9 @@ SUBDIRS = devel man sgml + +DIST_EXTRA = \ + changelogs/CHANGELOG \ + changelogs/CHANGELOG.ND \ + changelogs/CHANGELOG.R5 \ + README.DRI \ + README.fonts \ + README.rapidaccess diff --git a/hw/xfree86/doc/devel/Makefile.am b/hw/xfree86/doc/devel/Makefile.am index 5e7ed1570..6ca350c38 100644 --- a/hw/xfree86/doc/devel/Makefile.am +++ b/hw/xfree86/doc/devel/Makefile.am @@ -6,4 +6,5 @@ EXTRA_DIST = \ Domain.note \ RAC.Notes \ Registry \ - exa-driver.txt \ No newline at end of file + exa-driver.txt \ + README.DRIcomp diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am index 0144a1b8d..2ab7960c7 100644 --- a/hw/xwin/Makefile.am +++ b/hw/xwin/Makefile.am @@ -105,6 +105,22 @@ SRCS = InitInput.c \ winwakeup.c \ winwindow.c \ winwndproc.c \ + ddraw.h \ + winclipboard.h \ + winconfig.h \ + win.h \ + winkeybd.h \ + winkeymap.h \ + winkeynames.h \ + winlayouts.h \ + winmessages.h \ + winmsg.h \ + winms.h \ + winmultiwindowclass.h \ + winprefs.h \ + winpriv.h \ + winresource.h \ + winwindow.h \ $(top_srcdir)/mi/miinitext.c \ $(top_srcdir)/fb/fbcmap.c \ $(SRCS_CLIPBOARD) \ @@ -147,3 +163,31 @@ AM_YFLAGS = -d AM_LFLAGS = -i AM_CFLAGS = -DHAVE_XWIN_CONFIG_H \ $(XWINMODULES_CFLAGS) + +dist_man_MANS = XWin.1 XWinrc.1 + +EXTRA_DIST = \ + _usr_X11R6_lib_X11_system.XWinrc \ + X-boxed.ico \ + X.ico \ + XWin.rc \ + xlaunch/config.cc \ + xlaunch/COPYING \ + xlaunch/main.cc \ + xlaunch/resources/dialog.rc \ + xlaunch/resources/fullscreen.bmp \ + xlaunch/resources/images.rc \ + xlaunch/resources/multiwindow.bmp \ + xlaunch/resources/nodecoration.bmp \ + xlaunch/resources/resources.h \ + xlaunch/resources/resources.rc \ + xlaunch/resources/strings.rc \ + xlaunch/resources/windowed.bmp \ + xlaunch/window/dialog.cc \ + xlaunch/window/dialog.h \ + xlaunch/window/util.cc \ + xlaunch/window/util.h \ + xlaunch/window/window.cc \ + xlaunch/window/window.h \ + xlaunch/window/wizard.cc \ + xlaunch/window/wizard.h