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

Take care of more files from monolith's Xserver/hw/xfree86/etc dir:

Browse Source 
hw/xfree86/utils/ioport/Makefile.am
Add ioport and pcitweak utils from monolith hw/xfree86/etc dir.
Generate xf86DefModeSet.c from vesamodes & extramodes
Add apSolaris.shar to EXTRA_DIST
This commit is contained in:
Alan Coopersmith 2005-09-26 20:58:26 +00:00
parent 9abccb5e65
commit 8907195d78
7 changed files with 140 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2005-09-26 Alan Coopersmith <alan.coopersmith@sun.com>
* configure.ac:
* hw/xfree86/utils/Makefile.am:
* hw/xfree86/utils/ioport/Makefile.am
* hw/xfree86/utils/pcitweak/Makefile.am:
Add ioport and pcitweak utils from monolith hw/xfree86/etc dir.
* xserver/xorg/hw/xfree86/common/Makefile.am:
Generate xf86DefModeSet.c from vesamodes & extramodes
* xserver/xorg/hw/xfree86/os-support/solaris/Makefile.am:
Add apSolaris.shar to EXTRA_DIST
2005-09-25 Alan Coopersmith <alan.coopersmith@sun.com>
* Xext/Makefile.am:

2
configure.ac
View File

@ -1118,6 +1118,8 @@ hw/xfree86/xf8_16bpp/Makefile
hw/xfree86/xf8_32bpp/Makefile
hw/xfree86/xf8_32wid/Makefile
hw/xfree86/utils/Makefile
hw/xfree86/utils/ioport/Makefile
hw/xfree86/utils/pcitweak/Makefile
hw/xfree86/utils/scanpci/Makefile
hw/xfree86/utils/xorgcfg/Makefile
hw/xfree86/utils/xorgconfig/Makefile

20
hw/xfree86/common/Makefile.am
View File

@ -22,9 +22,22 @@ 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)
$(RM) $@
cat $(MODEDEFSOURCES) > $@
xf86DefModeSet.c: $(MODEDEFS) $(srcdir)/modeline2c.pl
$(RM) $@
$(PERL) $(srcdir)/modeline2c.pl < $(MODEDEFS) > $@
BUILT_SOURCES = xf86DefModeSet.c
AM_LDFLAGS = -r
libcommon_a_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
xf86Cursor.c xf86DGA.c xf86DPMS.c xf86DefModes.c \
xf86Cursor.c xf86DGA.c xf86DPMS.c xf86DefModeSet.c \
xf86DoProbe.c xf86DoScanPci.c xf86Events.c \
xf86Globals.c xf86Io.c xf86AutoConfig.c \
xf86MiscExt.c xf86Option.c \
@ -47,7 +60,7 @@ sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
$(XVSDKINCS) atKeynames.h xf86Version.h xorgVersion.h \
xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h
DISTCLEANFILES = xf86Build.h
DISTCLEANFILES = xf86Build.h $(MODEDEFS) $(BUILT_SOURCES)
# this is a hack for now. as above we don't have rules to build all of these
# yet, but we want to make sure they all get into the distball. this should
@ -84,6 +97,9 @@ EXTRA_DIST = \
xf86Version.h \
xorgVersion.h \
xf86Date.h \
xf86DefModes.c \
$(MODEDEFSOURCES) \
modeline2c.pl \
$(DISTKBDSOURCES)
AM_CFLAGS = $(XORG_CFLAGS)

3
hw/xfree86/os-support/solaris/Makefile.am
View File

@ -38,5 +38,6 @@ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
INCLUDES = $(XORG_INCS)
EXTRA_DIST = solaris-amd64.S solaris-ia32.S solaris-sparcv8plus.S
EXTRA_DIST = solaris-amd64.S solaris-ia32.S solaris-sparcv8plus.S \
apSolaris.shar

2
hw/xfree86/utils/Makefile.am
View File

@ -1,4 +1,6 @@
SUBDIRS = \
ioport \
pcitweak \
scanpci \
xorgcfg \
xorgconfig

56
hw/xfree86/utils/ioport/Makefile.am Normal file
View File

@ -0,0 +1,56 @@
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, and/or sell copies of the Software, and to permit persons
# to whom the Software is furnished to do so, provided that the above
# copyright notice(s) and this permission notice appear in all copies of
# the Software and that both the above copyright notice(s) and this
# permission notice appear in supporting documentation.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
# Except as contained in this notice, the name of a copyright holder
# shall not be used in advertising or otherwise to promote the sale, use
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
bin_PROGRAMS = ioport
XFREE86_SRCDIR = $(top_srcdir)/hw/xfree86
DUMMYLIB_SRCDIR = $(XFREE86_SRCDIR)/dummylib
INCLUDES = $(XORG_INCS) -I$(DUMMYLIB_SRCDIR)
ioport_CFLAGS = $(XORG_CFLAGS)
ioport_LDADD = \
../../os-support/libxorgos.la \
../../dummylib/libdummy-nonserver.a
ioport_SOURCES = \
ioport.c
ioport_PROGRAM_LINKS = inb inw inl outb outw outl
all-local:
@for i in $(ioport_PROGRAM_LINKS); do (set -x; \
$(RM) $$i; $(LN_S) ioport $$i); \
done
install-exec-hook:
@for i in $(ioport_PROGRAM_LINKS); do (set -x; \
$(RM) $(DESTDIR)$(bindir)/$$i; \
(cd $(DESTDIR)$(bindir); $(LN_S) ioport $$i)); \
done

46
hw/xfree86/utils/pcitweak/Makefile.am Normal file
View File

@ -0,0 +1,46 @@
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, and/or sell copies of the Software, and to permit persons
# to whom the Software is furnished to do so, provided that the above
# copyright notice(s) and this permission notice appear in all copies of
# the Software and that both the above copyright notice(s) and this
# permission notice appear in supporting documentation.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
# Except as contained in this notice, the name of a copyright holder
# shall not be used in advertising or otherwise to promote the sale, use
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
bin_PROGRAMS = pcitweak
XFREE86_SRCDIR = $(top_srcdir)/hw/xfree86
DUMMYLIB_SRCDIR = $(XFREE86_SRCDIR)/dummylib
INCLUDES = $(XORG_INCS) -I$(DUMMYLIB_SRCDIR)
pcitweak_CFLAGS = $(XORG_CFLAGS)
pcitweak_LDADD = \
../../os-support/libxorgos.la \
../../dummylib/libdummy-nonserver.a
pcitweak_SOURCES = \
pcitweak.c
dist_man1_MANS = \
pcitweak.man