vice-emu-commit Mailing List for VICE (Page 1068)
Versatile Commodore Emulator
Brought to you by:
blackystardust,
gpz
You can subscribe to this list here.
2008 |
Jan
|
Feb
|
Mar
|
Apr
(38) |
May
(60) |
Jun
(122) |
Jul
(148) |
Aug
(178) |
Sep
(151) |
Oct
(131) |
Nov
(208) |
Dec
(129) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
(193) |
Feb
(209) |
Mar
(221) |
Apr
(243) |
May
(165) |
Jun
(168) |
Jul
(198) |
Aug
(161) |
Sep
(103) |
Oct
(98) |
Nov
(168) |
Dec
(99) |
2010 |
Jan
(263) |
Feb
(156) |
Mar
(57) |
Apr
(93) |
May
(85) |
Jun
(124) |
Jul
(57) |
Aug
(58) |
Sep
(113) |
Oct
(148) |
Nov
(114) |
Dec
(193) |
2011 |
Jan
(200) |
Feb
(207) |
Mar
(91) |
Apr
(91) |
May
(142) |
Jun
(104) |
Jul
(115) |
Aug
(137) |
Sep
(266) |
Oct
(91) |
Nov
(85) |
Dec
(186) |
2012 |
Jan
(98) |
Feb
(146) |
Mar
(160) |
Apr
(99) |
May
(59) |
Jun
(257) |
Jul
(84) |
Aug
(103) |
Sep
(169) |
Oct
(206) |
Nov
(90) |
Dec
(296) |
2013 |
Jan
(294) |
Feb
(130) |
Mar
(36) |
Apr
(14) |
May
(51) |
Jun
(74) |
Jul
(180) |
Aug
(85) |
Sep
(26) |
Oct
(45) |
Nov
(29) |
Dec
(21) |
2014 |
Jan
(56) |
Feb
(40) |
Mar
(57) |
Apr
(30) |
May
(31) |
Jun
(11) |
Jul
(107) |
Aug
(135) |
Sep
(142) |
Oct
(195) |
Nov
(139) |
Dec
(133) |
2015 |
Jan
(293) |
Feb
(161) |
Mar
(146) |
Apr
(85) |
May
(139) |
Jun
(51) |
Jul
(21) |
Aug
(24) |
Sep
(29) |
Oct
(136) |
Nov
(212) |
Dec
(118) |
2016 |
Jan
(119) |
Feb
(165) |
Mar
(229) |
Apr
(219) |
May
(134) |
Jun
(119) |
Jul
(134) |
Aug
(236) |
Sep
(203) |
Oct
(215) |
Nov
(300) |
Dec
(140) |
2017 |
Jan
(188) |
Feb
(20) |
Mar
(147) |
Apr
(198) |
May
(26) |
Jun
(21) |
Jul
(67) |
Aug
(219) |
Sep
(209) |
Oct
(194) |
Nov
(144) |
Dec
(99) |
2018 |
Jan
(139) |
Feb
(122) |
Mar
(116) |
Apr
(85) |
May
(232) |
Jun
(181) |
Jul
(190) |
Aug
(105) |
Sep
(92) |
Oct
(178) |
Nov
(105) |
Dec
(86) |
2019 |
Jan
(119) |
Feb
(79) |
Mar
(74) |
Apr
(117) |
May
(115) |
Jun
(307) |
Jul
(107) |
Aug
(131) |
Sep
(103) |
Oct
(60) |
Nov
(118) |
Dec
(70) |
2020 |
Jan
(114) |
Feb
(103) |
Mar
(77) |
Apr
(121) |
May
(193) |
Jun
(110) |
Jul
(214) |
Aug
(210) |
Sep
(179) |
Oct
(260) |
Nov
(237) |
Dec
(334) |
2021 |
Jan
(163) |
Feb
(186) |
Mar
(58) |
Apr
(81) |
May
(108) |
Jun
(175) |
Jul
(154) |
Aug
(180) |
Sep
(217) |
Oct
(204) |
Nov
(232) |
Dec
(190) |
2022 |
Jan
(253) |
Feb
(134) |
Mar
(229) |
Apr
(190) |
May
(125) |
Jun
(70) |
Jul
(8) |
Aug
(22) |
Sep
(19) |
Oct
(33) |
Nov
(94) |
Dec
(164) |
2023 |
Jan
(158) |
Feb
(366) |
Mar
(272) |
Apr
(109) |
May
(198) |
Jun
(226) |
Jul
(200) |
Aug
(94) |
Sep
(108) |
Oct
(62) |
Nov
(175) |
Dec
(116) |
2024 |
Jan
(35) |
Feb
(40) |
Mar
(51) |
Apr
(89) |
May
(24) |
Jun
(26) |
Jul
(53) |
Aug
(71) |
Sep
(23) |
Oct
(11) |
Nov
(22) |
Dec
(58) |
2025 |
Jan
(26) |
Feb
(40) |
Mar
(107) |
Apr
(39) |
May
(35) |
Jun
(20) |
Jul
(11) |
Aug
(24) |
Sep
(35) |
Oct
(18) |
Nov
|
Dec
|
From: <st...@us...> - 2008-05-19 20:09:57
|
Revision: 18794 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18794&view=rev Author: strik Date: 2008-05-19 13:09:20 -0700 (Mon, 19 May 2008) Log Message: ----------- 2008-05-19 Spiro Trikaliotis <spi...@gm...> * autogen.sh: Removed "bash-ism" from script (compare with "==" instead of "="). Modified Paths: -------------- trunk/vice/ChangeLog trunk/vice/autogen.sh Modified: trunk/vice/ChangeLog =================================================================== --- trunk/vice/ChangeLog 2008-05-19 19:42:01 UTC (rev 18793) +++ trunk/vice/ChangeLog 2008-05-19 20:09:20 UTC (rev 18794) @@ -1,5 +1,10 @@ 2008-05-19 Spiro Trikaliotis <spi...@gm...> + * autogen.sh: Removed "bash-ism" from script (compare with "==" + instead of "="). + +2008-05-19 Spiro Trikaliotis <spi...@gm...> + * depcomp, missing, aclocal.m4, po/stamp-cat-id, po/vice.pot, po/fr.gmo, po/nl.gmo, po/pl.gmo, po/hu.gmo, po/it.gmo, po/de.gmo, po/sv.gmo: Removed some more auto-generated or Modified: trunk/vice/autogen.sh =================================================================== --- trunk/vice/autogen.sh 2008-05-19 19:42:01 UTC (rev 18793) +++ trunk/vice/autogen.sh 2008-05-19 20:09:20 UTC (rev 18794) @@ -89,7 +89,7 @@ buildfiles -if [ x"$1" == x"--dist" ]; then +if [ x"$1" = x"--dist" ]; then ./configure (cd src/monitor/; make mon_lex.c mon_parse.c) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-05-19 19:42:58
|
Revision: 18793 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18793&view=rev Author: strik Date: 2008-05-19 12:42:01 -0700 (Mon, 19 May 2008) Log Message: ----------- 2008-05-19 Spiro Trikaliotis <spi...@gm...> * src/resid/configure, src/resid/depcomp, src/resid/config.guess, src/resid/config.sub, src/resid/mkinstalldirs, src/resid/missing, src/resid/aclocal.m4, src/resid/install-sh, depcomp, missing, aclocal.m4, po/stamp-cat-id, po/vice.pot, po/fr.gmo, po/nl.gmo, po/pl.gmo, po/hu.gmo, po/it.gmo, po/de.gmo, po/sv.gmo: Removed some more auto-generated or unnecessary files. Modified Paths: -------------- trunk/vice/ChangeLog trunk/vice/src/ChangeLog Removed Paths: ------------- trunk/vice/aclocal.m4 trunk/vice/depcomp trunk/vice/missing trunk/vice/po/de.gmo trunk/vice/po/fr.gmo trunk/vice/po/hu.gmo trunk/vice/po/it.gmo trunk/vice/po/nl.gmo trunk/vice/po/pl.gmo trunk/vice/po/stamp-cat-id trunk/vice/po/sv.gmo trunk/vice/po/vice.pot trunk/vice/src/resid/aclocal.m4 trunk/vice/src/resid/config.guess trunk/vice/src/resid/config.sub trunk/vice/src/resid/configure trunk/vice/src/resid/depcomp trunk/vice/src/resid/install-sh trunk/vice/src/resid/missing trunk/vice/src/resid/mkinstalldirs Modified: trunk/vice/ChangeLog =================================================================== --- trunk/vice/ChangeLog 2008-05-18 21:08:38 UTC (rev 18792) +++ trunk/vice/ChangeLog 2008-05-19 19:42:01 UTC (rev 18793) @@ -1,3 +1,10 @@ +2008-05-19 Spiro Trikaliotis <spi...@gm...> + + * depcomp, missing, aclocal.m4, po/stamp-cat-id, po/vice.pot, + po/fr.gmo, po/nl.gmo, po/pl.gmo, po/hu.gmo, po/it.gmo, + po/de.gmo, po/sv.gmo: Removed some more auto-generated or + unnecessary files. + 2008-05-18 Spiro Trikaliotis <spi...@gm...> * Version 1.22.15. Deleted: trunk/vice/aclocal.m4 =================================================================== --- trunk/vice/aclocal.m4 2008-05-18 21:08:38 UTC (rev 18792) +++ trunk/vice/aclocal.m4 2008-05-19 19:42:01 UTC (rev 18793) @@ -1,884 +0,0 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 7 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -#serial 3 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 12 - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 5 - -# AM_PROG_LEX -# ----------- -# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a -# "missing" invocation, for better error output. -AC_DEFUN([AM_PROG_LEX], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AM_MISSING_HAS_RUN])dnl -AC_REQUIRE([AC_PROG_LEX])dnl -if test "$LEX" = :; then - LEX=${am_missing_run}flex -fi]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 3 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) -AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 3 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar <conftest.tar]) - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - -m4_include([acinclude.m4]) Deleted: trunk/vice/depcomp =================================================================== --- trunk/vice/depcomp 2008-05-18 21:08:38 UTC (rev 18792) +++ trunk/vice/depcomp 2008-05-19 19:42:01 UTC (rev 18793) @@ -1,530 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2005-07-09.11 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva <ol...@dc...>. - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to <bug...@gn...>. -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" - if test "$libtool" = yes; then - "$@" -Wc,-M - else - "$@" -M - fi - stat=$? - - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - - if test -f "$tmpdepfile"; then - outname="$stripped.o" - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mecanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. - "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no - for arg in "$@"; do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - "$@" || exit $? - IFS=" " - for arg - do - case "$arg" in - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: Deleted: trunk/vice/missing =================================================================== --- trunk/vice/missing 2008-05-18 21:08:38 UTC (rev 18792) +++ trunk/vice/missing 2008-05-19 19:42:01 UTC (rev 18793) @@ -1,360 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2005-06-08.21 - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pi...@ir...>, 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case "$1" in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Send bug reports to <bug...@gn...>." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). -case "$1" in - lex|yacc) - # Not GNU programs, they don't have --version. - ;; - - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case "$f" in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if [ ! -f y.tab.h ]; then - echo >y.tab.h - fi - if [ ! -f y.tab.c ]; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if [ ! -f lex.yy.c ]; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi -... [truncated message content] |
From: <cnv...@us...> - 2008-05-18 21:08:38
|
Revision: 18792 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18792&view=rev Author: cnvogelg Date: 2008-05-18 14:08:38 -0700 (Sun, 18 May 2008) Log Message: ----------- chris/cocoa-port: * configure.in: added Carbon framework for Mac OS X (required for UIType stuff) * Makefile.am: call bindist script always with bash on Mac OS X * src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m: do not use 10.5 code Modified Paths: -------------- branches/chris/cocoa-port/vice/Makefile.am branches/chris/cocoa-port/vice/configure.in branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m Modified: branches/chris/cocoa-port/vice/Makefile.am =================================================================== --- branches/chris/cocoa-port/vice/Makefile.am 2008-05-18 20:34:42 UTC (rev 18791) +++ branches/chris/cocoa-port/vice/Makefile.am 2008-05-18 21:08:38 UTC (rev 18792) @@ -60,10 +60,10 @@ if UNIX_MACOSX_COMPILE bindist: - $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) nozip @UNIX_MACOSX_UITYPE@ + /bin/bash @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) nozip @UNIX_MACOSX_UITYPE@ bindistzip: - $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) zip @UNIX_MACOSX_UITYPE@ + /bin/bash @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) zip @UNIX_MACOSX_UITYPE@ endif if UNIX_SKYOS_COMPILE Modified: branches/chris/cocoa-port/vice/configure.in =================================================================== --- branches/chris/cocoa-port/vice/configure.in 2008-05-18 20:34:42 UTC (rev 18791) +++ branches/chris/cocoa-port/vice/configure.in 2008-05-18 21:08:38 UTC (rev 18792) @@ -1834,7 +1834,7 @@ ARCH_LIBS="$ARCH_DIR/macosx/cocoa/menu/libarchmacosxcocoamenu.a $ARCH_DIR/macosx/cocoa/dialog/libarchmacosxcocoadialog.a $ARCH_DIR/macosx/cocoa/libarchmacosxcocoa.a $ARCH_DIR/macosx/cocoa/view/libarchmacosxcocoaview.a $ARCH_DIR/macosx/libarchmacosx.a $ARCH_DIR/libarch.a $ARCH_LIBS" ARCH_INCLUDES="-I$ARCH_SRC_DIR/macosx/cocoa/menu -I$ARCH_SRC_DIR/macosx/cocoa/dialog -I$ARCH_SRC_DIR/macosx/cocoa/view -I$ARCH_SRC_DIR/macosx/cocoa -I$ARCH_SRC_DIR $ARCH_INCLUDES" ARCH_EXTRA_SUBDIR="macosx macosx/cocoa macosx/cocoa/view macosx/cocoa/menu macosx/cocoa/dialog" - UI_LIBS="-framework Cocoa -framework OpenGL" + UI_LIBS="-framework Cocoa -framework OpenGL -framework Carbon" UNIX_MACOSX_UITYPE=cocoa else ARCH_LIBS="$ARCH_DIR/macosx/libarchmacosx.a $ARCH_LIBS" Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m 2008-05-18 20:34:42 UTC (rev 18791) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m 2008-05-18 21:08:38 UTC (rev 18792) @@ -78,7 +78,9 @@ -(BOOL)addFromDictionary:(NSDictionary *)dict { NSMutableArray *a = [[NSMutableArray alloc] init]; - for(id key in dict) { + NSEnumerator *enumerator = [dict keyEnumerator]; + id key; + while((key = [enumerator nextObject])) { ResourceTreeItem *item = [[ResourceTreeItem alloc] initWithTitle:key]; [a addObject:item]; @@ -405,8 +407,10 @@ [cacheValue release]; cacheValue = nil; } else { - for(id item in children) { - [(ResourceTreeItem *)item invalidateCache]; + int num = [children count]; + int i; + for(i=0;i<num;i++) { + [(ResourceTreeItem *)[children objectAtIndex:i] invalidateCache]; } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cnv...@us...> - 2008-05-18 20:34:51
|
Revision: 18791 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18791&view=rev Author: cnvogelg Date: 2008-05-18 13:34:42 -0700 (Sun, 18 May 2008) Log Message: ----------- chris/cocoa-port: merged trunk [18746]-[18785] (1.22.15) Modified Paths: -------------- branches/chris/cocoa-port/vice/ChangeLog branches/chris/cocoa-port/vice/build/mingw32/build-cross.sh branches/chris/cocoa-port/vice/configure.in branches/chris/cocoa-port/vice/data/fonts/Makefile.am branches/chris/cocoa-port/vice/doc/Makefile.am branches/chris/cocoa-port/vice/doc/html/Makefile.am branches/chris/cocoa-port/vice/po/de.gmo branches/chris/cocoa-port/vice/po/de.po branches/chris/cocoa-port/vice/po/fr.gmo branches/chris/cocoa-port/vice/po/fr.po branches/chris/cocoa-port/vice/po/hu.gmo branches/chris/cocoa-port/vice/po/hu.po branches/chris/cocoa-port/vice/po/it.gmo branches/chris/cocoa-port/vice/po/it.po branches/chris/cocoa-port/vice/po/nl.gmo branches/chris/cocoa-port/vice/po/nl.po branches/chris/cocoa-port/vice/po/pl.gmo branches/chris/cocoa-port/vice/po/pl.po branches/chris/cocoa-port/vice/po/sv.gmo branches/chris/cocoa-port/vice/po/sv.po branches/chris/cocoa-port/vice/po/vice.pot branches/chris/cocoa-port/vice/src/ChangeLog branches/chris/cocoa-port/vice/src/arch/amigaos/uiapi.c branches/chris/cocoa-port/vice/src/arch/os2/vac++/config.h branches/chris/cocoa-port/vice/src/arch/os2/watcom/config.h branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/uifileentry.c branches/chris/cocoa-port/vice/src/arch/unix/x11/ui-resources.c branches/chris/cocoa-port/vice/src/arch/unix/x11/xaw/x11video.c branches/chris/cocoa-port/vice/src/arch/win32/ui-resources.c branches/chris/cocoa-port/vice/src/arch/win32/ui.c branches/chris/cocoa-port/vice/src/arch/win32/uikeyboard.c branches/chris/cocoa-port/vice/src/arch/win32/uikeyboard.h branches/chris/cocoa-port/vice/src/arch/win32/watcom/config.h branches/chris/cocoa-port/vice/src/arch/win32/watcom/maincpu.tgt branches/chris/cocoa-port/vice/src/ioutil.c branches/chris/cocoa-port/vice/src/monitor/Makefile.am branches/chris/cocoa-port/vice/src/romset.c branches/chris/cocoa-port/vice/src/version.h Added Paths: ----------- branches/chris/cocoa-port/vice/autogen.sh branches/chris/cocoa-port/vice/data/fonts/vice-cbm.bdf Removed Paths: ------------- branches/chris/cocoa-port/vice/Makefile.in branches/chris/cocoa-port/vice/build/Makefile.in branches/chris/cocoa-port/vice/configure branches/chris/cocoa-port/vice/data/C128/Makefile.in branches/chris/cocoa-port/vice/data/C64/Makefile.in branches/chris/cocoa-port/vice/data/CBM-II/Makefile.in branches/chris/cocoa-port/vice/data/DRIVES/Makefile.in branches/chris/cocoa-port/vice/data/Makefile.in branches/chris/cocoa-port/vice/data/PET/Makefile.in branches/chris/cocoa-port/vice/data/PLUS4/Makefile.in branches/chris/cocoa-port/vice/data/PRINTER/Makefile.in branches/chris/cocoa-port/vice/data/VIC20/Makefile.in branches/chris/cocoa-port/vice/data/fonts/Makefile.in branches/chris/cocoa-port/vice/doc/Makefile.in branches/chris/cocoa-port/vice/doc/html/Makefile.in branches/chris/cocoa-port/vice/doc/texinfo.tex branches/chris/cocoa-port/vice/man/Makefile.in branches/chris/cocoa-port/vice/po/cat-id-tbl.c branches/chris/cocoa-port/vice/src/Makefile.in branches/chris/cocoa-port/vice/src/arch/Makefile.in branches/chris/cocoa-port/vice/src/arch/amigaos/Makefile.in branches/chris/cocoa-port/vice/src/arch/beos/Makefile.in branches/chris/cocoa-port/vice/src/arch/msdos/Makefile.in branches/chris/cocoa-port/vice/src/arch/os2/Makefile.in branches/chris/cocoa-port/vice/src/arch/os2/dialogs/Makefile.in branches/chris/cocoa-port/vice/src/arch/os2/kbd/Makefile.in branches/chris/cocoa-port/vice/src/arch/os2/snippets/Makefile.in branches/chris/cocoa-port/vice/src/arch/os2/vac++/Makefile.in branches/chris/cocoa-port/vice/src/arch/riscos/Makefile.in branches/chris/cocoa-port/vice/src/arch/unix/Makefile.in branches/chris/cocoa-port/vice/src/arch/unix/gp2x/Makefile.in branches/chris/cocoa-port/vice/src/arch/unix/gui/Makefile.in branches/chris/cocoa-port/vice/src/arch/unix/macosx/Makefile.in branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.in branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/Makefile.in branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/Makefile.in branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.in branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/Makefile.in branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/Makefile.in branches/chris/cocoa-port/vice/src/arch/unix/readline/Makefile.in branches/chris/cocoa-port/vice/src/arch/unix/x11/Makefile.in branches/chris/cocoa-port/vice/src/arch/unix/x11/gnome/Makefile.in branches/chris/cocoa-port/vice/src/arch/unix/x11/xaw/Makefile.in branches/chris/cocoa-port/vice/src/arch/unix/x11/xaw/widgets/Makefile.in branches/chris/cocoa-port/vice/src/arch/win32/Makefile.in branches/chris/cocoa-port/vice/src/arch/win32/utils/Makefile.in branches/chris/cocoa-port/vice/src/c128/Makefile.in branches/chris/cocoa-port/vice/src/c64/Makefile.in branches/chris/cocoa-port/vice/src/c64/cart/Makefile.in branches/chris/cocoa-port/vice/src/cbm2/Makefile.in branches/chris/cocoa-port/vice/src/config.h.in branches/chris/cocoa-port/vice/src/core/Makefile.in branches/chris/cocoa-port/vice/src/crtc/Makefile.in branches/chris/cocoa-port/vice/src/diskimage/Makefile.in branches/chris/cocoa-port/vice/src/drive/Makefile.in branches/chris/cocoa-port/vice/src/drive/iec/Makefile.in branches/chris/cocoa-port/vice/src/drive/iec/c64exp/Makefile.in branches/chris/cocoa-port/vice/src/drive/iec/plus4exp/Makefile.in branches/chris/cocoa-port/vice/src/drive/iec128dcr/Makefile.in branches/chris/cocoa-port/vice/src/drive/iecieee/Makefile.in branches/chris/cocoa-port/vice/src/drive/ieee/Makefile.in branches/chris/cocoa-port/vice/src/drive/tcbm/Makefile.in branches/chris/cocoa-port/vice/src/fileio/Makefile.in branches/chris/cocoa-port/vice/src/fsdevice/Makefile.in branches/chris/cocoa-port/vice/src/gfxoutputdrv/Makefile.in branches/chris/cocoa-port/vice/src/iecbus/Makefile.in branches/chris/cocoa-port/vice/src/imagecontents/Makefile.in branches/chris/cocoa-port/vice/src/lib/Makefile.in branches/chris/cocoa-port/vice/src/lib/lpng/Makefile.in branches/chris/cocoa-port/vice/src/lib/zlib/Makefile.in branches/chris/cocoa-port/vice/src/monitor/Makefile.in branches/chris/cocoa-port/vice/src/parallel/Makefile.in branches/chris/cocoa-port/vice/src/pet/Makefile.in branches/chris/cocoa-port/vice/src/plus4/Makefile.in branches/chris/cocoa-port/vice/src/printerdrv/Makefile.in branches/chris/cocoa-port/vice/src/raster/Makefile.in branches/chris/cocoa-port/vice/src/resid/Makefile.in branches/chris/cocoa-port/vice/src/rs232drv/Makefile.in branches/chris/cocoa-port/vice/src/serial/Makefile.in branches/chris/cocoa-port/vice/src/sid/Makefile.in branches/chris/cocoa-port/vice/src/sounddrv/Makefile.in branches/chris/cocoa-port/vice/src/tape/Makefile.in branches/chris/cocoa-port/vice/src/vdc/Makefile.in branches/chris/cocoa-port/vice/src/vdrive/Makefile.in branches/chris/cocoa-port/vice/src/vic20/Makefile.in branches/chris/cocoa-port/vice/src/vicii/Makefile.in branches/chris/cocoa-port/vice/src/video/Makefile.in Modified: branches/chris/cocoa-port/vice/ChangeLog =================================================================== --- branches/chris/cocoa-port/vice/ChangeLog 2008-05-18 20:20:12 UTC (rev 18790) +++ branches/chris/cocoa-port/vice/ChangeLog 2008-05-18 20:34:42 UTC (rev 18791) @@ -1,3 +1,43 @@ +2008-05-18 Spiro Trikaliotis <spi...@gm...> + + * Version 1.22.15. + +2008-05-16 Marco van den Heuvel <bla...@ya...> + + * doc/html/Makefile.am, doc/Makefile.am: Changed the way the + docdir is dealt with, old way made some autotools versions end + up with an error. + +2008-05-13 Spiro Trikaliotis <spi...@gm...> + + * autogen.sh: generates (almost) all files which can be + auto-generated. Exceptions: Files which are needed for platforms + which cannot built them themselves, or which are deliberately + changed from the auto-generated forms. These files are: + config.guess, config.sub (deliberately changed), and + src/monitor/mon_parse.c, src/monitor/mon_parse.h, + src/monitor/mon_lex.c (their absense would break compilation for + some platforms). + + * src/config.h.in, doc/texinfo.tex, po/cat-id-tbl.c, + */Makefile.in: removed files which can be auto-generated. + +2008-05-07 Spiro Trikaliotis <spi...@gm...> + + * Version 1.22.14. + +2008-04-27 Spiro Trikaliotis <spi...@gm...> + + * Version 1.22.13. + + * build/mingw32/build-cross.sh: Fix so the compiler is added to + the path even if it is already installed on the system. + +2008-04-20 Christian Vogelgsang <ch...@vo...> + + * build/macosx/build-inc.sh, build/macosx/build-ffmpeglame.sh: + updated Mac OS X build scripts. + 2008-04-26 Spiro Trikaliotis <spi...@gm...> * Version 1.22.12. Deleted: branches/chris/cocoa-port/vice/Makefile.in =================================================================== --- branches/chris/cocoa-port/vice/Makefile.in 2008-05-18 20:20:12 UTC (rev 18790) +++ branches/chris/cocoa-port/vice/Makefile.in 2008-05-18 20:34:42 UTC (rev 18791) @@ -1,866 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# Process this file with automake to produce Makefile.in -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS config.guess config.sub depcomp \ - install-sh missing mkinstalldirs -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -ALTERNATE_DOCDIR_FALSE = @ALTERNATE_DOCDIR_FALSE@ -ALTERNATE_DOCDIR_TRUE = @ALTERNATE_DOCDIR_TRUE@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMIGA_COMPILE_FALSE = @AMIGA_COMPILE_FALSE@ -AMIGA_COMPILE_TRUE = @AMIGA_COMPILE_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -ARCH_DIR = @ARCH_DIR@ -ARCH_EXTRA_SUBDIR = @ARCH_EXTRA_SUBDIR@ -ARCH_INCLUDES = @ARCH_INCLUDES@ -ARCH_LIBS = @ARCH_LIBS@ -ARCH_SRC_DIR = @ARCH_SRC_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BEOS_COMPILE_FALSE = @BEOS_COMPILE_FALSE@ -BEOS_COMPILE_TRUE = @BEOS_COMPILE_TRUE@ -BINDIR = @BINDIR@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CROSS = @CROSS@ -CROSS_FALSE = @CROSS_FALSE@ -CROSS_TRUE = @CROSS_TRUE@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DOS_TFE_PCAP_LIB = @DOS_TFE_PCAP_LIB@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FFMPEG_INCLUDES = @FFMPEG_INCLUDES@ -FFMPEG_LIBS = @FFMPEG_LIBS@ -FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@ -GENCAT = @GENCAT@ -GFXOUTPUT_DRIVERS = @GFXOUTPUT_DRIVERS@ -GFXOUTPUT_LIBS = @GFXOUTPUT_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_FALSE = @GNOMEUI_FALSE@ -GNOMEUI_TRUE = @GNOMEUI_TRUE@ -GREP = @GREP@ -GTKGL_CFLAGS = @GTKGL_CFLAGS@ -GTKGL_LIBS = @GTKGL_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HAVE_RAWDRIVE_FALSE = @HAVE_RAWDRIVE_FALSE@ -HAVE_RAWDRIVE_TRUE = @HAVE_RAWDRIVE_TRUE@ -HAVE_READLINE = @HAVE_READLINE@ -HAVE_REALDEVICE_FALSE = @HAVE_REALDEVICE_FALSE@ -HAVE_REALDEVICE_TRUE = @HAVE_REALDEVICE_TRUE@ -HAVE_RESID_FALSE = @HAVE_RESID_FALSE@ -HAVE_RESID_TRUE = @HAVE_RESID_TRUE@ -HAVE_RS232_FALSE = @HAVE_RS232_FALSE@ -HAVE_RS232_TRUE = @HAVE_RS232_TRUE@ -HAVE_TRANSLATION_FALSE = @HAVE_TRANSLATION_FALSE@ -HAVE_TRANSLATION_TRUE = @HAVE_TRANSLATION_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -JOY_LIBS = @JOY_LIBS@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LINKCC = @LINKCC@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MACOSX_COCOA_FALSE = @MACOSX_COCOA_FALSE@ -MACOSX_COCOA_TRUE = @MACOSX_COCOA_TRUE@ -MAKEINFO = @MAKEINFO@ -MAKE_BINDIST_FALSE = @MAKE_BINDIST_FALSE@ -MAKE_BINDIST_TRUE = @MAKE_BINDIST_TRUE@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSDOS_COMPILE_FALSE = @MSDOS_COMPILE_FALSE@ -MSDOS_COMPILE_TRUE = @MSDOS_COMPILE_TRUE@ -MSGFMT = @MSGFMT@ -NEED_READLINE_FALSE = @NEED_READLINE_FALSE@ -NEED_READLINE_TRUE = @NEED_READLINE_TRUE@ -NETPLAY_LIBS = @NETPLAY_LIBS@ -NLS_LOCALEDIR = @NLS_LOCALEDIR@ -OBJC = @OBJC@ -OBJCDEPMODE = @OBJCDEPMODE@ -OBJCFLAGS = @OBJCFLAGS@ -OBJEXT = @OBJEXT@ -OS2_COMPILE_FALSE = @OS2_COMPILE_FALSE@ -OS2_COMPILE_TRUE = @OS2_COMPILE_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PKG_CONFIG = @PKG_CONFIG@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -READLINE = @READLINE@ -READLINE_LIBS = @READLINE_LIBS@ -RESID_DEP = @RESID_DEP@ -RESID_DIR = @RESID_DIR@ -RESID_INCLUDES = @RESID_INCLUDES@ -RESID_LIBS = @RESID_LIBS@ -RISCOS_COMPILE_FALSE = @RISCOS_COMPILE_FALSE@ -RISCOS_COMPILE_TRUE = @RISCOS_COMPILE_TRUE@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SOUND_AIX_OBJ = @SOUND_AIX_OBJ@ -SOUND_DRIVERS = @SOUND_DRIVERS@ -SOUND_HPUX_OBJ = @SOUND_HPUX_OBJ@ -SOUND_LIBS = @SOUND_LIBS@ -SOUND_MIDAS_OBJ = @SOUND_MIDAS_OBJ@ -SOUND_SDL_OBJ = @SOUND_SDL_OBJ@ -SOUND_SGI_OBJ = @SOUND_SGI_OBJ@ -SOUND_USS_OBJ = @SOUND_USS_OBJ@ -STRIP = @STRIP@ -TFE_LIBS = @TFE_LIBS@ -UI_LIBS = @UI_LIBS@ -UNIX_COMPILE_FALSE = @UNIX_COMPILE_FALSE@ -UNIX_COMPILE_TRUE = @UNIX_COMPILE_TRUE@ -UNIX_GP2X_COMPILE_FALSE = @UNIX_GP2X_COMPILE_FALSE@ -UNIX_GP2X_COMPILE_TRUE = @UNIX_GP2X_COMPILE_TRUE@ -UNIX_HPUX_COMPILE_FALSE = @UNIX_HPUX_COMPILE_FALSE@ -UNIX_HPUX_COMPILE_TRUE = @UNIX_HPUX_COMPILE_TRUE@ -UNIX_MACOSX_COMPILE_FALSE = @UNIX_MACOSX_COMPILE_FALSE@ -UNIX_MACOSX_COMPILE_TRUE = @UNIX_MACOSX_COMPILE_TRUE@ -UNIX_MACOSX_UITYPE = @UNIX_MACOSX_UITYPE@ -UNIX_OPENSERVER5_COMPILE_FALSE = @UNIX_OPENSERVER5_COMPILE_FALSE@ -UNIX_OPENSERVER5_COMPILE_TRUE = @UNIX_OPENSERVER5_COMPILE_TRUE@ -UNIX_OPENSERVER6_COMPILE_FALSE = @UNIX_OPENSERVER6_COMPILE_FALSE@ -UNIX_OPENSERVER6_COMPILE_TRUE = @UNIX_OPENSERVER6_COMPILE_TRUE@ -UNIX_QNX4_COMPILE_FALSE = @UNIX_QNX4_COMPILE_FALSE@ -UNIX_QNX4_COMPILE_TRUE = @UNIX_QNX4_COMPILE_TRUE@ -UNIX_QNX6_COMPILE_FALSE = @UNIX_QNX6_COMPILE_FALSE@ -UNIX_QNX6_COMPILE_TRUE = @UNIX_QNX6_COMPILE_TRUE@ -UNIX_SKYOS_COMPILE_FALSE = @UNIX_SKYOS_COMPILE_FALSE@ -UNIX_SKYOS_COMPILE_TRUE = @UNIX_SKYOS_COMPILE_TRUE@ -UNIX_SOLARIS_COMPILE_FALSE = @UNIX_SOLARIS_COMPILE_FALSE@ -UNIX_SOLARIS_COMPILE_TRUE = @UNIX_SOLARIS_COMPILE_TRUE@ -UNIX_UNIXWARE_COMPILE_FALSE = @UNIX_UNIXWARE_COMPILE_FALSE@ -UNIX_UNIXWARE_COMPILE_TRUE = @UNIX_UNIXWARE_COMPILE_TRUE@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_MIDAS_SOUND_FALSE = @USE_MIDAS_SOUND_FALSE@ -USE_MIDAS_SOUND_TRUE = @USE_MIDAS_SOUND_TRUE@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -VERSION_RC = @VERSION_RC@ -VICEDIR = @VICEDIR@ -VICE_LIBPNG = @VICE_LIBPNG@ -VICE_LIBPNG_DEP = @VICE_LIBPNG_DEP@ -VICE_LIBPNG_DIR = @VICE_LIBPNG_DIR@ -VICE_LIBPNG_INCLUDES = @VICE_LIBPNG_INCLUDES@ -VICE_SYNC = @VICE_SYNC@ -VICE_VERSION = @VICE_VERSION@ -VICE_VERSION_BUILD = @VICE_VERSION_BUILD@ -VICE_VERSION_MAJOR = @VICE_VERSION_MAJOR@ -VICE_VERSION_MINOR = @VICE_VERSION_MINOR@ -VICE_ZLIB = @VICE_ZLIB@ -VICE_ZLIB_DEP = @VICE_ZLIB_DEP@ -VICE_ZLIB_DIR = @VICE_ZLIB_DIR@ -VICE_ZLIB_INCLUDES = @VICE_ZLIB_INCLUDES@ -WIN32_COMPILE_FALSE = @WIN32_COMPILE_FALSE@ -WIN32_COMPILE_TRUE = @WIN32_COMPILE_TRUE@ -WINDRES = @WINDRES@ -WRC = @WRC@ -X128_WINRES = @X128_WINRES@ -X64_WINRES = @X64_WINRES@ -XCBM2_WINRES = @XCBM2_WINRES@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XPET_WINRES = @XPET_WINRES@ -XPLUS4_WINRES = @XPLUS4_WINRES@ -XVIC_WINRES = @XVIC_WINRES@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@ -am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -artsc_config = @artsc_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -cxx = @cxx@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sdl_config = @sdl_config@ -sharedstatedir = @sharedstatedir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -x128_LDFLAGS = @x128_LDFLAGS@ -x64_LDFLAGS = @x64_LDFLAGS@ -xcbm2_LDFLAGS = @xcbm2_LDFLAGS@ -xpet_LDFLAGS = @xpet_LDFLAGS@ -xplus4_LDFLAGS = @xplus4_LDFLAGS@ -xvic_LDFLAGS = @xvic_LDFLAGS@ -SUBDIRS = $(POSUB) src build data man doc -EXTRA_DIST = AUTHORS FEEDBACK COPYING INSTALL NEWS vice.spec -all: all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/po $(distdir)/src - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-recursive ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ - dist-tarZ dist-zip distcheck distclean distclean-generic \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am - - -.PHONY: x64 x128 xvic xpet xplus4 xcbm2 -x64: - (cd src; $(MAKE) x64-all) - -x128: - (cd src; $(MAKE) x128-all) - -xvic: - (cd src; $(MAKE) xvic-all) - -xpet: - (cd src; $(MAKE) xpet-all) - -xplus4: - (cd src; $(MAKE) xplus4-all) - -xcbm2: - (cd src; $(MAKE) xcbm2-all) - -install: installvice - -@AMIGA_COMPILE_TRUE@bindist: -@AMIGA_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) nozip $(top_srcdir) $(EXEEXT) - -@AMIGA_COMPILE_TRUE@bindistzip: -@AMIGA_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) zip $(top_srcdir) $(EXEEXT) - -@BEOS_COMPILE_TRUE@bindist: -@BEOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) nozip $(top_srcdir) - -@BEOS_COMPILE_TRUE@bindistzip: -@BEOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) zip $(top_srcdir) - -@MSDOS_COMPILE_TRUE@bindist: -@MSDOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) nozip $(top_srcdir) - -@MSDOS_COMPILE_TRUE@bindistzip: -@MSDOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) zip $(top_srcdir) - -@UNIX_GP2X_COMPILE_TRUE@bindist: -@UNIX_GP2X_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/gp2x/make-bindist.sh $(STRIP) $(VICE_VERSION) nozip $(top_srcdir) - -@UNIX_GP2X_COMPILE_TRUE@bindistzip: -@UNIX_GP2X_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/gp2x/make-bindist.sh $(STRIP) $(VICE_VERSION) zip $(top_srcdir) - -@UNIX_MACOSX_COMPILE_TRUE@bindist: -@UNIX_MACOSX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) nozip @UNIX_MACOSX_UITYPE@ - -@UNIX_MACOSX_COMPILE_TRUE@bindistzip: -@UNIX_MACOSX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) zip @UNIX_MACOSX_UITYPE@ - -@UNIX_SKYOS_COMPILE_TRUE@bindist: -@UNIX_SKYOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) nozip $(top_srcdir) - -@UNIX_SKYOS_COMPILE_TRUE@bindistzip: -@UNIX_SKYOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) zip $(top_srcdir) - -@UNIX_QNX6_COMPILE_TRUE@bindist: -@UNIX_QNX6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip $(top_srcdir) - -@UNIX_QNX6_COMPILE_TRUE@bindistzip: -@UNIX_QNX6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip $(top_srcdir) - -@UNIX_QNX4_COMPILE_TRUE@bindist: -@UNIX_QNX4_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx4/make-bindist.sh $(VICE_VERSION) $(prefix) nozip $(top_srcdir) - -@UNIX_QNX4_COMPILE_TRUE@bindistzip: -@UNIX_QNX4_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx4/make-bindist.sh $(VICE_VERSION) $(prefix) zip $(top_srcdir) - -@UNIX_HPUX_COMPILE_TRUE@bindist: -@UNIX_HPUX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/hpux/make-bindist.sh $(STRIP) $(PERL) $(VICE_VERSION) $(prefix) $(host_cpu) $(host_os) nozip $(top_srcdir) - -@UNIX_HPUX_COMPILE_TRUE@bindistzip: -@UNIX_HPUX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/hpux/make-bindist.sh $(STRIP) $(PERL) $(VICE_VERSION) $(prefix) $(host_cpu) $(host_os) zip $(top_srcdir) - -@UNIX_SOLARIS_COMPILE_TRUE@bindist: -@UNIX_SOLARIS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sol $(infodir) $(mandir) $(top_srcdir) - -@UNIX_SOLARIS_COMPILE_TRUE@bindistzip: -@UNIX_SOLARIS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sol $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER5_COMPILE_TRUE@bindist: -@UNIX_OPENSERVER5_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco5 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER5_COMPILE_TRUE@bindistzip: -@UNIX_OPENSERVER5_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco5 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER6_COMPILE_TRUE@bindist: -@UNIX_OPENSERVER6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco6 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER6_COMPILE_TRUE@bindistzip: -@UNIX_OPENSERVER6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco6 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_UNIXWARE_COMPILE_TRUE@bindist: -@UNIX_UNIXWARE_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco7 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_UNIXWARE_COMPILE_TRUE@bindistzip: -@UNIX_UNIXWARE_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco7 $(infodir) $(mandir) $(top_srcdir) - -@WIN32_COMPILE_TRUE@bindist: -@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) nozip $(top_srcdir) - -@WIN32_COMPILE_TRUE@bindistzip: -@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) zip $(top_srcdir) - -@RISCOS_COMPILE_TRUE@bindist: -@RISCOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) nozip $(top_srcdir) - -@RISCOS_COMPILE_TRUE@bindistzip: -@RISCOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) zip $(top_srcdir) - -@MAKE_BINDIST_TRUE@installvice: -@MAKE_BINDIST_TRUE@ echo this platform doesn\'t use \"make install\", use \"make bindist\" instead - -@MAKE_BINDIST_FALSE@installvice: install-recursive - -cleantrans: - rm `find $(top_srcdir) -name "*.po.c"` -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Copied: branches/chris/cocoa-port/vice/autogen.sh (from rev 18785, trunk/vice/autogen.sh) =================================================================== --- branches/chris/cocoa-port/vice/autogen.sh (rev 0) +++ branches/chris/cocoa-port/vice/autogen.sh 2008-05-18 20:34:42 UTC (rev 18791) @@ -0,0 +1,104 @@ +#! /bin/sh + +# +# autogen.sh - generate the auto* files of VICE +# +# Written by +# Spiro Trikaliotis <spi...@gm...> +# +# This file is part of VICE, the Versatile Commodore Emulator. +# See README for copyright notice. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. +# + +do_command() { + # $1 - command + # $2 - options + + echo `pwd`: $1 $2 + $1 $2 > .$1.out 2>&1 + ret=$? + if [ ! $ret = 0 ] ; then + echo "ERROR: $1 failed in `pwd`" + exit 1 + fi +} + +do_aclocal() { + do_command aclocal +} + +do_autoconf() { + do_command autoconf -f +} + +do_autoheader() { + if [ ! x"`sed -ne "s/.*AM_CONFIG_HEADER\((.*)\).*/\1/p" configure.in`" = x ]; then + do_command autoheader + fi +} + +do_automake() { + do_command automake "-a -c" # " -f" +} + +buildfiles() { + FILES_TO_REMEMBER="INSTALL" + + # Save some files which should not be overwritten + + for A in $FILES_TO_REMEMBER; do + [ -e $A ] && mv $A $A.backup + done + + do_aclocal + + do_autoconf + do_autoheader + do_automake + + # Restore the files which should not be overwritten + + for A in $FILES_TO_REMEMBER; do + [ -e $A ] && mv $A.backup $A + done +} + +SUBDIRECTORIES=`sed -ne "s/.*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/p" configure.in` + +for A in $SUBDIRECTORIES; do + ( + cd $A + buildfiles + ) +done + +buildfiles + +if [ x"$1" == x"--dist" ]; then + + ./configure + (cd src/monitor/; make mon_lex.c mon_parse.c) + + (cd po; make cat-id-tbl.c) + + SVN_ADD_FILES="configure src/config.h.in config.guess config.sub src/monitor/mon_parse.c src/monitor/mon_parse.h src/monitor/mon_lex.c src/resid/depcomp src/resid/mkinstalldirs src/resid/missing src/resid/install-sh doc/texinfo.tex po/cat-id-tbl.c" + SVN_ADD_MAKEFILES="`find . -name Makefile.in`" + + svn add $SVN_ADD_FILES $SVN_ADD_MAKEFILES + +fi Deleted: branches/chris/cocoa-port/vice/build/Makefile.in =================================================================== --- branches/chris/cocoa-port/vice/build/Makefile.in 2008-05-18 20:20:12 UTC (rev 18790) +++ branches/chris/cocoa-port/vice/build/Makefile.in 2008-05-18 20:34:42 UTC (rev 18791) @@ -1,484 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = build -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALTERNATE_DOCDIR_FALSE = @ALTERNATE_DOCDIR_FALSE@ -ALTERNATE_DOCDIR_TRUE = @ALTERNATE_DOCDIR_TRUE@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMIGA_COMPILE_FALSE = @AMIGA_COMPILE_FALSE@ -AMIGA_COMPILE_TRUE = @AMIGA_COMPILE_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -ARCH_DIR = @ARCH_DIR@ -ARCH_EXTRA_SUBDIR = @ARCH_EXTRA_SUBDIR@ -ARCH_INCLUDES = @ARCH_INCLUDES@ -ARCH_LIBS = @ARCH_LIBS@ -ARCH_SRC_DIR = @ARCH_SRC_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BEOS_COMPILE_FALSE = @BEOS_COMPILE_FALSE@ -BEOS_COMPILE_TRUE = @BEOS_COMPILE_TRUE@ -BINDIR = @BINDIR@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CROSS = @CROSS@ -CROSS_FALSE = @CROSS_FALSE@ -CROSS_TRUE = @CROSS_TRUE@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DOS_TFE_PCAP_LIB = @DOS_TFE_PCAP_LIB@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FFMPEG_INCLUDES = @FFMPEG_INCLUDES@ -FFMPEG_LIBS = @FFMPEG_LIBS@ -FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@ -GENCAT = @GENCAT@ -GFXOUTPUT_DRIVERS = @GFXOUTPUT_DRIVERS@ -GFXOUTPUT_LIBS = @GFXOUTPUT_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_FALSE = @GNOMEUI_FALSE@ -GNOMEUI_TRUE = @GNOMEUI_TRUE@ -GREP = @GREP@ -GTKGL_CFLAGS = @GTKGL_CFLAGS@ -GTKGL_LIBS = @GTKGL_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HAVE_RAWDRIVE_FALSE = @HAVE_RAWDRIVE_FALSE@ -HAVE_RAWDRIVE_TRUE = @HAVE_RAWDRIVE_TRUE@ -HAVE_READLINE = @HAVE_READLINE@ -HAVE_REALDEVICE_FALSE = @HAVE_REALDEVICE_FALSE@ -HAVE_REALDEVICE_TRUE = @HAVE_REALDEVICE_TRUE@ -HAVE_RESID_FALSE = @HAVE_RESID_FALSE@ -HAVE_RESID_TRUE = @HAVE_RESID_TRUE@ -HAVE_RS232_FALSE = @HAVE_RS232_FALSE@ -HAVE_RS232_TRUE = @HAVE_RS232_TRUE@ -HAVE_TRANSLATION_FALSE = @HAVE_TRANSLATION_FALSE@ -HAVE_TRANSLATION_TRUE = @HAVE_TRANSLATION_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -JOY_LIBS = @JOY_LIBS@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LINKCC = @LINKCC@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MACOSX_COCOA_FALSE = @MACOSX_COCOA_FALSE@ -MACOSX_COCOA_TRUE = @MACOSX_COCOA_TRUE@ -MAKEINFO = @MAKEINFO@ -MAKE_BINDIST_FALSE = @MAKE_BINDIST_FALSE@ -MAKE_BINDIST_TRUE = @MAKE_BINDIST_TRUE@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSDOS_COMPILE_FALSE = @MSDOS_COMPILE_FALSE@ -MSDOS_COMPILE_TRUE = @MSDOS_COMPILE_TRUE@ -MSGFMT = @MSGFMT@ -NEED_READLINE_FALSE = @NEED_READLINE_FALSE@ -NEED_READLINE_TRUE = @NEED_READLINE_TRUE@ -NETPLAY_LIBS = @NETPLAY_LIBS@ -NLS_LOCALEDIR = @NLS_LOCALEDIR@ -OBJC = @OBJC@ -OBJCDEPMODE = @OBJCDEPMODE@ -OBJCFLAGS = @OBJCFLAGS@ -OBJEXT = @OBJEXT@ -OS2_COMPILE_FALSE = @OS2_COMPILE_FALSE@ -OS2_COMPILE_TRUE = @OS2_COMPILE_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PKG_CONFIG = @PKG_CONFIG@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -READLINE = @READLINE@ -READLINE_LIBS = @READLINE_LIBS@ -RESID_DEP = @RESID_DEP@ -RESID_DIR = @RESID_DIR@ -RESID_INCLUDES = @RESID_INCLUDES@ -RESID_LIBS = @RESID_LIBS@ -RISCOS_COMPILE_FALSE = @RISCOS_COMPILE_FALSE@ -RISCOS_COMPILE_TRUE = @RISCOS_COMPILE_TRUE@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SOUND_AIX_OBJ = @SOUND_AIX_OBJ@ -SOUND_DRIVERS = @SOUND_DRIVERS@ -SOUND_HPUX_OBJ = @SOUND_HPUX_OBJ@ -SOUND_LIBS = @SOUND_LIBS@ -SOUND_MIDAS_OBJ = @SOUND_MIDAS_OBJ@ -SOUND_SDL_OBJ = @SOUND_SDL_OBJ@ -SOUND_SGI_OBJ = @SOUND_SGI_OBJ@ -SOUND_USS_OBJ = @SOUND_USS_OBJ@ -STRIP = @STRIP@ -TFE_LIBS = @TFE_LIBS@ -UI_LIBS = @UI_LIBS@ -UNIX_COMPILE_FALSE = @UNIX_COMPILE_FALSE@ -UNIX_COMPILE_TRUE = @UNIX_COMPILE_TRUE@ -UNIX_GP2X_COMPILE_FALSE = @UNIX_GP2X_COMPILE_FALSE@ -UNIX_GP2X_COMPILE_TRUE = @UNIX_GP2X_COMPILE_TRUE@ -UNIX_HPUX_COMPILE_FALSE = @UNIX_HPUX_COMPILE_FALSE@ -UNIX_HPUX_COMPILE_TRUE = @UNIX_HPUX_COMPILE_TRUE@ -UNIX_MACOSX_COMPILE_FALSE = @UNIX_MACOSX_COMPILE_FALSE@ -UNIX_MACOSX_COMPILE_TRUE = @UNIX_MACOSX_COMPILE_TRUE@ -UNIX_MACOSX_UITYPE = @UNIX_MACOSX_UITYPE@ -UNIX_OPENSERVER5_COMPILE_FALSE = @UNIX_OPENSERVER5_COMPILE_FALSE@ -UNIX_OPENSERVER5_COMPILE_TRUE = @UNIX_OPENSERVER5_COMPILE_TRUE@ -UNIX_OPENSERVER6_COMPILE_FALSE = @UNIX_OPENSERVER6_COMPILE_FALSE@ -UNIX_OPENSERVER6_COMPILE_TRUE = @UNIX_OPENSERVER6_COMPILE_TRUE@ -UNIX_QNX4_COMPILE_FALSE = @UNIX_QNX4_COMPILE_FALSE@ -UNIX_QNX4_COMPILE_TRUE = @UNIX_QNX4_COMPILE_TRUE@ -UNIX_QNX6_COMPILE_FALSE = @UNIX_QNX6_COMPILE_FALSE@ -UNIX_QNX6_COMPILE_TRUE = @UNIX_QNX6_COMPILE_TRUE@ -UNIX_SKYOS_COMPILE_FALSE = @UNIX_SKYOS_COMPILE_FALSE@ -UNIX_SKYOS_COMPILE_TRUE = @UNIX_SKYOS_COMPILE_TRUE@ -UNIX_SOLARIS_COMPILE_FALSE = @UNIX_SOLARIS_COMPILE_FALSE@ -UNIX_SOLARIS_COMPILE_TRUE = @UNIX_SOLARIS_COMPILE_TRUE@ -UNIX_UNIXWARE_COMPILE_FALSE = @UNIX_UNIXWARE_COMPILE_FALSE@ -UNIX_UNIXWARE_COMPILE_TRUE = @UNIX_UNIXWARE_COMPILE_TRUE@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_MIDAS_SOUND_FALSE = @USE_MIDAS_SOUND_FALSE@ -USE_MIDAS_SOUND_TRUE = @USE_MIDAS_SOUND_TRUE@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -VERSION_RC = @VERSION_RC@ -VICEDIR = @VICEDIR@ -VICE_LIBPNG = @VICE_LIBPNG@ -VICE_LIBPNG_DEP = @VICE_LIBPNG_DEP@ -VICE_LIBPNG_DIR = @VICE_LIBPNG_DIR@ -VICE_LIBPNG_INCLUDES = @VICE_LIBPNG_INCLUDES@ -VICE_SYNC = @VICE_SYNC@ -VICE_VERSION = @VICE_VERSION@ -VICE_VERSION_BUILD = @VICE_VERSION_BUILD@ -VICE_VERSION_MAJOR = @VICE_VERSION_MAJOR@ -VICE_VERSION_MINOR = @VICE_VERSION_MINOR@ -VICE_ZLIB = @VICE_ZLIB@ -VICE_ZLIB_DEP = @VICE_ZLIB_DEP@ -VICE_ZLIB_DIR = @VICE_ZLIB_DIR@ -VICE_ZLIB_INCLUDES = @VICE_ZLIB_INCLUDES@ -WIN32_COMPILE_FALSE = @WIN32_COMPILE_FALSE@ -WIN32_COMPILE_TRUE = @WIN32_COMPILE_TRUE@ -WINDRES = @WINDRES@ -WRC = @WRC@ -X128_WINRES = @X128_WINRES@ -X64_WINRES = @X64_WINRES@ -XCBM2_WINRES = @XCBM2_WINRES@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XPET_WINRES = @XPET_WINRES@ -XPLUS4_WINRES = @XPLUS4_WINRES@ -XVIC_WINRES = @XVIC_WINRES@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@ -am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -artsc_config = @artsc_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -cxx = @cxx@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sdl_config = @sdl_config@ -sharedstatedir = @sharedstatedir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -x128_LDFLAGS = @x128_LDFLAGS@ -x64_LDFLAGS = @x64_LDFLAGS@ -xcbm2_LDFLAGS = @xcbm2_LDFLAGS@ -xpet_LDFLAGS = @xpet_LDFLAGS@ -xplus4_LDFLAGS = @xplus4_LDFLAGS@ -xvic_LDFLAGS = @xvic_LDFLAGS@ -EXTRA_DIST = \ - amigaos/build-os4-native.sh \ - amigaos/build-vbcc.sh \ - beos/ppc-build.sh \ - mingw32/build-cross.sh \ - macosx/build-allext.sh \ - macosx/build-gtk.sh \ - macosx/build-hidutils.sh \ - macosx/build-inc.sh \ - macosx/build-pcaplibnet.sh \ - macosx/build-readline.sh \ - macosx/build-vice-dist.sh \ - macosx/build-ffmpeglame.sh \ - minix3/build.sh \ - minix3/build-package.sh \ - qnx4/build.sh \ - riscos/build-cross.sh \ - vms/build.sh - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu build/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/amigaos $(distdir)/beos $(distdir)/macosx $(distdir)/mingw32 $(distdir)/minix3 $(distdir)/qnx4 $(distdir)/riscos $(distdir)/vms - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Modified: branches/chris/cocoa-port/vice/build/mingw32/build-cross.sh =================================================================== --- branches/chris/cocoa-port/vice/build/mingw32/build-cross.sh 2008-05-18 20:20:12 UTC (rev 18790) +++ branches/chris/cocoa-port/vice/build/mingw32/build-cross.sh 2008-05-18 20:34:42 UTC (rev 18791) @@ -302,12 +302,14 @@ if [ -f "$LOCAL_PREFIX/bin/$TARGET-gcc" ]; then echo "Local mingw32 compiler environment found." PREFIX="$LOCAL_PREFIX" + PATH="$PREFIX/bin:$PATH" else echo "No local mingw32 compiler environment found." echo "Checking for global mingw32 compiler environment." if [ -f "$GLOBAL_PREFIX/bin/$TARGET-gcc" ]; then echo "Global mingw32 compiler environment found." PREFIX="$GLOBAL_PREFIX" + PATH="$PREFIX/bin:$PATH" else echo "No global mingw32 compiler environment found." setup_compiler Deleted: branches/chris/cocoa-port/vice/configure =================================================================== --- branches/chris/cocoa-port/vice/configure 2008-05-18 20:20:12 UTC (rev 18790) +++ branches/chris/cocoa-port/vice/configure 2008-05-18 20:34:42 UTC (rev 18791) @@ -1,31313 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61. -# -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Lett... [truncated message content] |
From: <bla...@us...> - 2008-05-18 20:20:26
|
Revision: 18790 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18790&view=rev Author: blackystardust Date: 2008-05-18 13:20:12 -0700 (Sun, 18 May 2008) Log Message: ----------- Ports branch updated to 1.22.15 Modified Paths: -------------- branches/marco/ports/vice/ChangeLog branches/marco/ports/vice/configure.in branches/marco/ports/vice/doc/Makefile.am branches/marco/ports/vice/doc/html/Makefile.am branches/marco/ports/vice/po/vice.pot branches/marco/ports/vice/src/ChangeLog branches/marco/ports/vice/src/arch/os2/vac++/config.h branches/marco/ports/vice/src/arch/os2/watcom/config.h branches/marco/ports/vice/src/arch/unix/x11/gnome/uifileentry.c branches/marco/ports/vice/src/arch/unix/x11/ui-resources.c branches/marco/ports/vice/src/arch/win32/watcom/config.h branches/marco/ports/vice/src/arch/win32/watcom/maincpu.tgt branches/marco/ports/vice/src/ioutil.c branches/marco/ports/vice/src/monitor/Makefile.am branches/marco/ports/vice/src/version.h Added Paths: ----------- branches/marco/ports/vice/autogen.sh Removed Paths: ------------- branches/marco/ports/vice/Makefile.in branches/marco/ports/vice/build/Makefile.in branches/marco/ports/vice/configure branches/marco/ports/vice/data/C128/Makefile.in branches/marco/ports/vice/data/C64/Makefile.in branches/marco/ports/vice/data/CBM-II/Makefile.in branches/marco/ports/vice/data/DRIVES/Makefile.in branches/marco/ports/vice/data/Makefile.in branches/marco/ports/vice/data/PET/Makefile.in branches/marco/ports/vice/data/PLUS4/Makefile.in branches/marco/ports/vice/data/PRINTER/Makefile.in branches/marco/ports/vice/data/VIC20/Makefile.in branches/marco/ports/vice/data/fonts/Makefile.in branches/marco/ports/vice/doc/Makefile.in branches/marco/ports/vice/doc/html/Makefile.in branches/marco/ports/vice/doc/texinfo.tex branches/marco/ports/vice/man/Makefile.in branches/marco/ports/vice/po/cat-id-tbl.c branches/marco/ports/vice/src/Makefile.in branches/marco/ports/vice/src/arch/Makefile.in branches/marco/ports/vice/src/arch/amigaos/Makefile.in branches/marco/ports/vice/src/arch/beos/Makefile.in branches/marco/ports/vice/src/arch/msdos/Makefile.in branches/marco/ports/vice/src/arch/os2/Makefile.in branches/marco/ports/vice/src/arch/os2/dialogs/Makefile.in branches/marco/ports/vice/src/arch/os2/kbd/Makefile.in branches/marco/ports/vice/src/arch/os2/snippets/Makefile.in branches/marco/ports/vice/src/arch/os2/vac++/Makefile.in branches/marco/ports/vice/src/arch/riscos/Makefile.in branches/marco/ports/vice/src/arch/unix/Makefile.in branches/marco/ports/vice/src/arch/unix/gp2x/Makefile.in branches/marco/ports/vice/src/arch/unix/gui/Makefile.in branches/marco/ports/vice/src/arch/unix/macosx/Makefile.in branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.in branches/marco/ports/vice/src/arch/unix/macosx/Resources/Makefile.in branches/marco/ports/vice/src/arch/unix/macosx/cocoa/Makefile.in branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.in branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/Makefile.in branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/Makefile.in branches/marco/ports/vice/src/arch/unix/readline/Makefile.in branches/marco/ports/vice/src/arch/unix/x11/Makefile.in branches/marco/ports/vice/src/arch/unix/x11/gnome/Makefile.in branches/marco/ports/vice/src/arch/unix/x11/xaw/Makefile.in branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/Makefile.in branches/marco/ports/vice/src/arch/win32/Makefile.in branches/marco/ports/vice/src/arch/win32/utils/Makefile.in branches/marco/ports/vice/src/c128/Makefile.in branches/marco/ports/vice/src/c64/Makefile.in branches/marco/ports/vice/src/c64/cart/Makefile.in branches/marco/ports/vice/src/cbm2/Makefile.in branches/marco/ports/vice/src/config.h.in branches/marco/ports/vice/src/core/Makefile.in branches/marco/ports/vice/src/crtc/Makefile.in branches/marco/ports/vice/src/diskimage/Makefile.in branches/marco/ports/vice/src/drive/Makefile.in branches/marco/ports/vice/src/drive/iec/Makefile.in branches/marco/ports/vice/src/drive/iec/c64exp/Makefile.in branches/marco/ports/vice/src/drive/iec/plus4exp/Makefile.in branches/marco/ports/vice/src/drive/iec128dcr/Makefile.in branches/marco/ports/vice/src/drive/iecieee/Makefile.in branches/marco/ports/vice/src/drive/ieee/Makefile.in branches/marco/ports/vice/src/drive/tcbm/Makefile.in branches/marco/ports/vice/src/fileio/Makefile.in branches/marco/ports/vice/src/fsdevice/Makefile.in branches/marco/ports/vice/src/gfxoutputdrv/Makefile.in branches/marco/ports/vice/src/iecbus/Makefile.in branches/marco/ports/vice/src/imagecontents/Makefile.in branches/marco/ports/vice/src/lib/Makefile.in branches/marco/ports/vice/src/lib/lpng/Makefile.in branches/marco/ports/vice/src/lib/zlib/Makefile.in branches/marco/ports/vice/src/monitor/Makefile.in branches/marco/ports/vice/src/parallel/Makefile.in branches/marco/ports/vice/src/pet/Makefile.in branches/marco/ports/vice/src/plus4/Makefile.in branches/marco/ports/vice/src/printerdrv/Makefile.in branches/marco/ports/vice/src/raster/Makefile.in branches/marco/ports/vice/src/resid/Makefile.in branches/marco/ports/vice/src/rs232drv/Makefile.in branches/marco/ports/vice/src/serial/Makefile.in branches/marco/ports/vice/src/sid/Makefile.in branches/marco/ports/vice/src/sounddrv/Makefile.in branches/marco/ports/vice/src/tape/Makefile.in branches/marco/ports/vice/src/vdc/Makefile.in branches/marco/ports/vice/src/vdrive/Makefile.in branches/marco/ports/vice/src/vic20/Makefile.in branches/marco/ports/vice/src/vicii/Makefile.in branches/marco/ports/vice/src/video/Makefile.in Modified: branches/marco/ports/vice/ChangeLog =================================================================== --- branches/marco/ports/vice/ChangeLog 2008-05-18 20:08:16 UTC (rev 18789) +++ branches/marco/ports/vice/ChangeLog 2008-05-18 20:20:12 UTC (rev 18790) @@ -1,3 +1,27 @@ +2008-05-18 Spiro Trikaliotis <spi...@gm...> + + * Version 1.22.15. + +2008-05-16 Marco van den Heuvel <bla...@ya...> + + * doc/html/Makefile.am, doc/Makefile.am: Changed the way the + docdir is dealt with, old way made some autotools versions end + up with an error. + +2008-05-13 Spiro Trikaliotis <spi...@gm...> + + * autogen.sh: generates (almost) all files which can be + auto-generated. Exceptions: Files which are needed for platforms + which cannot built them themselves, or which are deliberately + changed from the auto-generated forms. These files are: + config.guess, config.sub (deliberately changed), and + src/monitor/mon_parse.c, src/monitor/mon_parse.h, + src/monitor/mon_lex.c (their absense would break compilation for + some platforms). + + * src/config.h.in, doc/texinfo.tex, po/cat-id-tbl.c, + */Makefile.in: removed files which can be auto-generated. + 2008-05-07 Spiro Trikaliotis <spi...@gm...> * Version 1.22.14. Deleted: branches/marco/ports/vice/Makefile.in =================================================================== --- branches/marco/ports/vice/Makefile.in 2008-05-18 20:08:16 UTC (rev 18789) +++ branches/marco/ports/vice/Makefile.in 2008-05-18 20:20:12 UTC (rev 18790) @@ -1,869 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# Process this file with automake to produce Makefile.in -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS config.guess config.sub depcomp \ - install-sh missing mkinstalldirs -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -ALTERNATE_DOCDIR_FALSE = @ALTERNATE_DOCDIR_FALSE@ -ALTERNATE_DOCDIR_TRUE = @ALTERNATE_DOCDIR_TRUE@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMIGA_COMPILE_FALSE = @AMIGA_COMPILE_FALSE@ -AMIGA_COMPILE_TRUE = @AMIGA_COMPILE_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -ARCH_DIR = @ARCH_DIR@ -ARCH_EXTRA_SUBDIR = @ARCH_EXTRA_SUBDIR@ -ARCH_INCLUDES = @ARCH_INCLUDES@ -ARCH_LIBS = @ARCH_LIBS@ -ARCH_SRC_DIR = @ARCH_SRC_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BEOS_COMPILE_FALSE = @BEOS_COMPILE_FALSE@ -BEOS_COMPILE_TRUE = @BEOS_COMPILE_TRUE@ -BINDIR = @BINDIR@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CROSS = @CROSS@ -CROSS_FALSE = @CROSS_FALSE@ -CROSS_TRUE = @CROSS_TRUE@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DOS_TFE_PCAP_LIB = @DOS_TFE_PCAP_LIB@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FCCACHE = @FCCACHE@ -FFMPEG_INCLUDES = @FFMPEG_INCLUDES@ -FFMPEG_LIBS = @FFMPEG_LIBS@ -FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@ -GENCAT = @GENCAT@ -GFXOUTPUT_DRIVERS = @GFXOUTPUT_DRIVERS@ -GFXOUTPUT_LIBS = @GFXOUTPUT_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_FALSE = @GNOMEUI_FALSE@ -GNOMEUI_TRUE = @GNOMEUI_TRUE@ -GREP = @GREP@ -GTKGL_CFLAGS = @GTKGL_CFLAGS@ -GTKGL_LIBS = @GTKGL_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HAVE_FC_CACHE_FALSE = @HAVE_FC_CACHE_FALSE@ -HAVE_FC_CACHE_TRUE = @HAVE_FC_CACHE_TRUE@ -HAVE_RAWDRIVE_FALSE = @HAVE_RAWDRIVE_FALSE@ -HAVE_RAWDRIVE_TRUE = @HAVE_RAWDRIVE_TRUE@ -HAVE_READLINE = @HAVE_READLINE@ -HAVE_REALDEVICE_FALSE = @HAVE_REALDEVICE_FALSE@ -HAVE_REALDEVICE_TRUE = @HAVE_REALDEVICE_TRUE@ -HAVE_RESID_FALSE = @HAVE_RESID_FALSE@ -HAVE_RESID_TRUE = @HAVE_RESID_TRUE@ -HAVE_RS232_FALSE = @HAVE_RS232_FALSE@ -HAVE_RS232_TRUE = @HAVE_RS232_TRUE@ -HAVE_TRANSLATION_FALSE = @HAVE_TRANSLATION_FALSE@ -HAVE_TRANSLATION_TRUE = @HAVE_TRANSLATION_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -JOY_LIBS = @JOY_LIBS@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LINKCC = @LINKCC@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MACOSX_COCOA_FALSE = @MACOSX_COCOA_FALSE@ -MACOSX_COCOA_TRUE = @MACOSX_COCOA_TRUE@ -MAKEINFO = @MAKEINFO@ -MAKE_BINDIST_FALSE = @MAKE_BINDIST_FALSE@ -MAKE_BINDIST_TRUE = @MAKE_BINDIST_TRUE@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSDOS_COMPILE_FALSE = @MSDOS_COMPILE_FALSE@ -MSDOS_COMPILE_TRUE = @MSDOS_COMPILE_TRUE@ -MSGFMT = @MSGFMT@ -NEED_READLINE_FALSE = @NEED_READLINE_FALSE@ -NEED_READLINE_TRUE = @NEED_READLINE_TRUE@ -NETPLAY_LIBS = @NETPLAY_LIBS@ -NLS_LOCALEDIR = @NLS_LOCALEDIR@ -OBJC = @OBJC@ -OBJCDEPMODE = @OBJCDEPMODE@ -OBJCFLAGS = @OBJCFLAGS@ -OBJEXT = @OBJEXT@ -OS2_COMPILE_FALSE = @OS2_COMPILE_FALSE@ -OS2_COMPILE_TRUE = @OS2_COMPILE_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PKG_CONFIG = @PKG_CONFIG@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -READLINE = @READLINE@ -READLINE_LIBS = @READLINE_LIBS@ -RESID_DEP = @RESID_DEP@ -RESID_DIR = @RESID_DIR@ -RESID_INCLUDES = @RESID_INCLUDES@ -RESID_LIBS = @RESID_LIBS@ -RISCOS_COMPILE_FALSE = @RISCOS_COMPILE_FALSE@ -RISCOS_COMPILE_TRUE = @RISCOS_COMPILE_TRUE@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SOUND_AIX_OBJ = @SOUND_AIX_OBJ@ -SOUND_DRIVERS = @SOUND_DRIVERS@ -SOUND_HPUX_OBJ = @SOUND_HPUX_OBJ@ -SOUND_LIBS = @SOUND_LIBS@ -SOUND_MIDAS_OBJ = @SOUND_MIDAS_OBJ@ -SOUND_SDL_OBJ = @SOUND_SDL_OBJ@ -SOUND_SGI_OBJ = @SOUND_SGI_OBJ@ -SOUND_USS_OBJ = @SOUND_USS_OBJ@ -STRIP = @STRIP@ -TFE_LIBS = @TFE_LIBS@ -UI_LIBS = @UI_LIBS@ -UNIX_COMPILE_FALSE = @UNIX_COMPILE_FALSE@ -UNIX_COMPILE_TRUE = @UNIX_COMPILE_TRUE@ -UNIX_GP2X_COMPILE_FALSE = @UNIX_GP2X_COMPILE_FALSE@ -UNIX_GP2X_COMPILE_TRUE = @UNIX_GP2X_COMPILE_TRUE@ -UNIX_HPUX_COMPILE_FALSE = @UNIX_HPUX_COMPILE_FALSE@ -UNIX_HPUX_COMPILE_TRUE = @UNIX_HPUX_COMPILE_TRUE@ -UNIX_MACOSX_COMPILE_FALSE = @UNIX_MACOSX_COMPILE_FALSE@ -UNIX_MACOSX_COMPILE_TRUE = @UNIX_MACOSX_COMPILE_TRUE@ -UNIX_MACOSX_UITYPE = @UNIX_MACOSX_UITYPE@ -UNIX_OPENSERVER5_COMPILE_FALSE = @UNIX_OPENSERVER5_COMPILE_FALSE@ -UNIX_OPENSERVER5_COMPILE_TRUE = @UNIX_OPENSERVER5_COMPILE_TRUE@ -UNIX_OPENSERVER6_COMPILE_FALSE = @UNIX_OPENSERVER6_COMPILE_FALSE@ -UNIX_OPENSERVER6_COMPILE_TRUE = @UNIX_OPENSERVER6_COMPILE_TRUE@ -UNIX_QNX4_COMPILE_FALSE = @UNIX_QNX4_COMPILE_FALSE@ -UNIX_QNX4_COMPILE_TRUE = @UNIX_QNX4_COMPILE_TRUE@ -UNIX_QNX6_COMPILE_FALSE = @UNIX_QNX6_COMPILE_FALSE@ -UNIX_QNX6_COMPILE_TRUE = @UNIX_QNX6_COMPILE_TRUE@ -UNIX_SKYOS_COMPILE_FALSE = @UNIX_SKYOS_COMPILE_FALSE@ -UNIX_SKYOS_COMPILE_TRUE = @UNIX_SKYOS_COMPILE_TRUE@ -UNIX_SOLARIS_COMPILE_FALSE = @UNIX_SOLARIS_COMPILE_FALSE@ -UNIX_SOLARIS_COMPILE_TRUE = @UNIX_SOLARIS_COMPILE_TRUE@ -UNIX_UNIXWARE_COMPILE_FALSE = @UNIX_UNIXWARE_COMPILE_FALSE@ -UNIX_UNIXWARE_COMPILE_TRUE = @UNIX_UNIXWARE_COMPILE_TRUE@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_MIDAS_SOUND_FALSE = @USE_MIDAS_SOUND_FALSE@ -USE_MIDAS_SOUND_TRUE = @USE_MIDAS_SOUND_TRUE@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -VERSION_RC = @VERSION_RC@ -VICEDIR = @VICEDIR@ -VICE_LIBPNG = @VICE_LIBPNG@ -VICE_LIBPNG_DEP = @VICE_LIBPNG_DEP@ -VICE_LIBPNG_DIR = @VICE_LIBPNG_DIR@ -VICE_LIBPNG_INCLUDES = @VICE_LIBPNG_INCLUDES@ -VICE_SYNC = @VICE_SYNC@ -VICE_VERSION = @VICE_VERSION@ -VICE_VERSION_BUILD = @VICE_VERSION_BUILD@ -VICE_VERSION_MAJOR = @VICE_VERSION_MAJOR@ -VICE_VERSION_MINOR = @VICE_VERSION_MINOR@ -VICE_ZLIB = @VICE_ZLIB@ -VICE_ZLIB_DEP = @VICE_ZLIB_DEP@ -VICE_ZLIB_DIR = @VICE_ZLIB_DIR@ -VICE_ZLIB_INCLUDES = @VICE_ZLIB_INCLUDES@ -WIN32_COMPILE_FALSE = @WIN32_COMPILE_FALSE@ -WIN32_COMPILE_TRUE = @WIN32_COMPILE_TRUE@ -WINDRES = @WINDRES@ -WRC = @WRC@ -X128_WINRES = @X128_WINRES@ -X64_WINRES = @X64_WINRES@ -XCBM2_WINRES = @XCBM2_WINRES@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XPET_WINRES = @XPET_WINRES@ -XPLUS4_WINRES = @XPLUS4_WINRES@ -XVIC_WINRES = @XVIC_WINRES@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@ -am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -artsc_config = @artsc_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -cxx = @cxx@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sdl_config = @sdl_config@ -sharedstatedir = @sharedstatedir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -x128_LDFLAGS = @x128_LDFLAGS@ -x64_LDFLAGS = @x64_LDFLAGS@ -xcbm2_LDFLAGS = @xcbm2_LDFLAGS@ -xpet_LDFLAGS = @xpet_LDFLAGS@ -xplus4_LDFLAGS = @xplus4_LDFLAGS@ -xvic_LDFLAGS = @xvic_LDFLAGS@ -SUBDIRS = $(POSUB) src build data man doc -EXTRA_DIST = AUTHORS FEEDBACK COPYING INSTALL NEWS vice.spec -all: all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/po $(distdir)/src - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-recursive ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ - dist-tarZ dist-zip distcheck distclean distclean-generic \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am - - -.PHONY: x64 x128 xvic xpet xplus4 xcbm2 -x64: - (cd src; $(MAKE) x64-all) - -x128: - (cd src; $(MAKE) x128-all) - -xvic: - (cd src; $(MAKE) xvic-all) - -xpet: - (cd src; $(MAKE) xpet-all) - -xplus4: - (cd src; $(MAKE) xplus4-all) - -xcbm2: - (cd src; $(MAKE) xcbm2-all) - -install: installvice - -@AMIGA_COMPILE_TRUE@bindist: -@AMIGA_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) nozip $(top_srcdir) $(EXEEXT) - -@AMIGA_COMPILE_TRUE@bindistzip: -@AMIGA_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) zip $(top_srcdir) $(EXEEXT) - -@BEOS_COMPILE_TRUE@bindist: -@BEOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) nozip $(top_srcdir) - -@BEOS_COMPILE_TRUE@bindistzip: -@BEOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) zip $(top_srcdir) - -@MSDOS_COMPILE_TRUE@bindist: -@MSDOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) nozip $(top_srcdir) - -@MSDOS_COMPILE_TRUE@bindistzip: -@MSDOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) zip $(top_srcdir) - -@UNIX_GP2X_COMPILE_TRUE@bindist: -@UNIX_GP2X_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/gp2x/make-bindist.sh $(STRIP) $(VICE_VERSION) nozip $(top_srcdir) - -@UNIX_GP2X_COMPILE_TRUE@bindistzip: -@UNIX_GP2X_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/gp2x/make-bindist.sh $(STRIP) $(VICE_VERSION) zip $(top_srcdir) - -@UNIX_MACOSX_COMPILE_TRUE@bindist: -@UNIX_MACOSX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) nozip @UNIX_MACOSX_UITYPE@ - -@UNIX_MACOSX_COMPILE_TRUE@bindistzip: -@UNIX_MACOSX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) zip @UNIX_MACOSX_UITYPE@ - -@UNIX_SKYOS_COMPILE_TRUE@bindist: -@UNIX_SKYOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) nozip $(top_srcdir) - -@UNIX_SKYOS_COMPILE_TRUE@bindistzip: -@UNIX_SKYOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) zip $(top_srcdir) - -@UNIX_QNX6_COMPILE_TRUE@bindist: -@UNIX_QNX6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip $(top_srcdir) - -@UNIX_QNX6_COMPILE_TRUE@bindistzip: -@UNIX_QNX6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip $(top_srcdir) - -@UNIX_QNX4_COMPILE_TRUE@bindist: -@UNIX_QNX4_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx4/make-bindist.sh $(VICE_VERSION) $(prefix) nozip $(top_srcdir) - -@UNIX_QNX4_COMPILE_TRUE@bindistzip: -@UNIX_QNX4_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx4/make-bindist.sh $(VICE_VERSION) $(prefix) zip $(top_srcdir) - -@UNIX_HPUX_COMPILE_TRUE@bindist: -@UNIX_HPUX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/hpux/make-bindist.sh $(STRIP) $(PERL) $(VICE_VERSION) $(prefix) $(host_cpu) $(host_os) nozip $(top_srcdir) - -@UNIX_HPUX_COMPILE_TRUE@bindistzip: -@UNIX_HPUX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/hpux/make-bindist.sh $(STRIP) $(PERL) $(VICE_VERSION) $(prefix) $(host_cpu) $(host_os) zip $(top_srcdir) - -@UNIX_SOLARIS_COMPILE_TRUE@bindist: -@UNIX_SOLARIS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sol $(infodir) $(mandir) $(top_srcdir) - -@UNIX_SOLARIS_COMPILE_TRUE@bindistzip: -@UNIX_SOLARIS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sol $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER5_COMPILE_TRUE@bindist: -@UNIX_OPENSERVER5_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco5 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER5_COMPILE_TRUE@bindistzip: -@UNIX_OPENSERVER5_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco5 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER6_COMPILE_TRUE@bindist: -@UNIX_OPENSERVER6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco6 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER6_COMPILE_TRUE@bindistzip: -@UNIX_OPENSERVER6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco6 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_UNIXWARE_COMPILE_TRUE@bindist: -@UNIX_UNIXWARE_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco7 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_UNIXWARE_COMPILE_TRUE@bindistzip: -@UNIX_UNIXWARE_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco7 $(infodir) $(mandir) $(top_srcdir) - -@WIN32_COMPILE_TRUE@bindist: -@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) nozip $(top_srcdir) - -@WIN32_COMPILE_TRUE@bindistzip: -@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) zip $(top_srcdir) - -@RISCOS_COMPILE_TRUE@bindist: -@RISCOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) nozip $(top_srcdir) - -@RISCOS_COMPILE_TRUE@bindistzip: -@RISCOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) zip $(top_srcdir) - -@MAKE_BINDIST_TRUE@installvice: -@MAKE_BINDIST_TRUE@ echo this platform doesn\'t use \"make install\", use \"make bindist\" instead - -@MAKE_BINDIST_FALSE@installvice: install-recursive - -cleantrans: - rm `find $(top_srcdir) -name "*.po.c"` -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Added: branches/marco/ports/vice/autogen.sh =================================================================== --- branches/marco/ports/vice/autogen.sh (rev 0) +++ branches/marco/ports/vice/autogen.sh 2008-05-18 20:20:12 UTC (rev 18790) @@ -0,0 +1,104 @@ +#! /bin/sh + +# +# autogen.sh - generate the auto* files of VICE +# +# Written by +# Spiro Trikaliotis <spi...@gm...> +# +# This file is part of VICE, the Versatile Commodore Emulator. +# See README for copyright notice. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. +# + +do_command() { + # $1 - command + # $2 - options + + echo `pwd`: $1 $2 + $1 $2 > .$1.out 2>&1 + ret=$? + if [ ! $ret = 0 ] ; then + echo "ERROR: $1 failed in `pwd`" + exit 1 + fi +} + +do_aclocal() { + do_command aclocal +} + +do_autoconf() { + do_command autoconf -f +} + +do_autoheader() { + if [ ! x"`sed -ne "s/.*AM_CONFIG_HEADER\((.*)\).*/\1/p" configure.in`" = x ]; then + do_command autoheader + fi +} + +do_automake() { + do_command automake "-a -c" # " -f" +} + +buildfiles() { + FILES_TO_REMEMBER="INSTALL" + + # Save some files which should not be overwritten + + for A in $FILES_TO_REMEMBER; do + [ -e $A ] && mv $A $A.backup + done + + do_aclocal + + do_autoconf + do_autoheader + do_automake + + # Restore the files which should not be overwritten + + for A in $FILES_TO_REMEMBER; do + [ -e $A ] && mv $A.backup $A + done +} + +SUBDIRECTORIES=`sed -ne "s/.*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/p" configure.in` + +for A in $SUBDIRECTORIES; do + ( + cd $A + buildfiles + ) +done + +buildfiles + +if [ x"$1" == x"--dist" ]; then + + ./configure + (cd src/monitor/; make mon_lex.c mon_parse.c) + + (cd po; make cat-id-tbl.c) + + SVN_ADD_FILES="configure src/config.h.in config.guess config.sub src/monitor/mon_parse.c src/monitor/mon_parse.h src/monitor/mon_lex.c src/resid/depcomp src/resid/mkinstalldirs src/resid/missing src/resid/install-sh doc/texinfo.tex po/cat-id-tbl.c" + SVN_ADD_MAKEFILES="`find . -name Makefile.in`" + + svn add $SVN_ADD_FILES $SVN_ADD_MAKEFILES + +fi Property changes on: branches/marco/ports/vice/autogen.sh ___________________________________________________________________ Name: svn:executable + * Deleted: branches/marco/ports/vice/build/Makefile.in =================================================================== --- branches/marco/ports/vice/build/Makefile.in 2008-05-18 20:08:16 UTC (rev 18789) +++ branches/marco/ports/vice/build/Makefile.in 2008-05-18 20:20:12 UTC (rev 18790) @@ -1,487 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = build -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALTERNATE_DOCDIR_FALSE = @ALTERNATE_DOCDIR_FALSE@ -ALTERNATE_DOCDIR_TRUE = @ALTERNATE_DOCDIR_TRUE@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMIGA_COMPILE_FALSE = @AMIGA_COMPILE_FALSE@ -AMIGA_COMPILE_TRUE = @AMIGA_COMPILE_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -ARCH_DIR = @ARCH_DIR@ -ARCH_EXTRA_SUBDIR = @ARCH_EXTRA_SUBDIR@ -ARCH_INCLUDES = @ARCH_INCLUDES@ -ARCH_LIBS = @ARCH_LIBS@ -ARCH_SRC_DIR = @ARCH_SRC_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BEOS_COMPILE_FALSE = @BEOS_COMPILE_FALSE@ -BEOS_COMPILE_TRUE = @BEOS_COMPILE_TRUE@ -BINDIR = @BINDIR@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CROSS = @CROSS@ -CROSS_FALSE = @CROSS_FALSE@ -CROSS_TRUE = @CROSS_TRUE@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DOS_TFE_PCAP_LIB = @DOS_TFE_PCAP_LIB@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FCCACHE = @FCCACHE@ -FFMPEG_INCLUDES = @FFMPEG_INCLUDES@ -FFMPEG_LIBS = @FFMPEG_LIBS@ -FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@ -GENCAT = @GENCAT@ -GFXOUTPUT_DRIVERS = @GFXOUTPUT_DRIVERS@ -GFXOUTPUT_LIBS = @GFXOUTPUT_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_FALSE = @GNOMEUI_FALSE@ -GNOMEUI_TRUE = @GNOMEUI_TRUE@ -GREP = @GREP@ -GTKGL_CFLAGS = @GTKGL_CFLAGS@ -GTKGL_LIBS = @GTKGL_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HAVE_FC_CACHE_FALSE = @HAVE_FC_CACHE_FALSE@ -HAVE_FC_CACHE_TRUE = @HAVE_FC_CACHE_TRUE@ -HAVE_RAWDRIVE_FALSE = @HAVE_RAWDRIVE_FALSE@ -HAVE_RAWDRIVE_TRUE = @HAVE_RAWDRIVE_TRUE@ -HAVE_READLINE = @HAVE_READLINE@ -HAVE_REALDEVICE_FALSE = @HAVE_REALDEVICE_FALSE@ -HAVE_REALDEVICE_TRUE = @HAVE_REALDEVICE_TRUE@ -HAVE_RESID_FALSE = @HAVE_RESID_FALSE@ -HAVE_RESID_TRUE = @HAVE_RESID_TRUE@ -HAVE_RS232_FALSE = @HAVE_RS232_FALSE@ -HAVE_RS232_TRUE = @HAVE_RS232_TRUE@ -HAVE_TRANSLATION_FALSE = @HAVE_TRANSLATION_FALSE@ -HAVE_TRANSLATION_TRUE = @HAVE_TRANSLATION_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -JOY_LIBS = @JOY_LIBS@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LINKCC = @LINKCC@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MACOSX_COCOA_FALSE = @MACOSX_COCOA_FALSE@ -MACOSX_COCOA_TRUE = @MACOSX_COCOA_TRUE@ -MAKEINFO = @MAKEINFO@ -MAKE_BINDIST_FALSE = @MAKE_BINDIST_FALSE@ -MAKE_BINDIST_TRUE = @MAKE_BINDIST_TRUE@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSDOS_COMPILE_FALSE = @MSDOS_COMPILE_FALSE@ -MSDOS_COMPILE_TRUE = @MSDOS_COMPILE_TRUE@ -MSGFMT = @MSGFMT@ -NEED_READLINE_FALSE = @NEED_READLINE_FALSE@ -NEED_READLINE_TRUE = @NEED_READLINE_TRUE@ -NETPLAY_LIBS = @NETPLAY_LIBS@ -NLS_LOCALEDIR = @NLS_LOCALEDIR@ -OBJC = @OBJC@ -OBJCDEPMODE = @OBJCDEPMODE@ -OBJCFLAGS = @OBJCFLAGS@ -OBJEXT = @OBJEXT@ -OS2_COMPILE_FALSE = @OS2_COMPILE_FALSE@ -OS2_COMPILE_TRUE = @OS2_COMPILE_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PKG_CONFIG = @PKG_CONFIG@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -READLINE = @READLINE@ -READLINE_LIBS = @READLINE_LIBS@ -RESID_DEP = @RESID_DEP@ -RESID_DIR = @RESID_DIR@ -RESID_INCLUDES = @RESID_INCLUDES@ -RESID_LIBS = @RESID_LIBS@ -RISCOS_COMPILE_FALSE = @RISCOS_COMPILE_FALSE@ -RISCOS_COMPILE_TRUE = @RISCOS_COMPILE_TRUE@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SOUND_AIX_OBJ = @SOUND_AIX_OBJ@ -SOUND_DRIVERS = @SOUND_DRIVERS@ -SOUND_HPUX_OBJ = @SOUND_HPUX_OBJ@ -SOUND_LIBS = @SOUND_LIBS@ -SOUND_MIDAS_OBJ = @SOUND_MIDAS_OBJ@ -SOUND_SDL_OBJ = @SOUND_SDL_OBJ@ -SOUND_SGI_OBJ = @SOUND_SGI_OBJ@ -SOUND_USS_OBJ = @SOUND_USS_OBJ@ -STRIP = @STRIP@ -TFE_LIBS = @TFE_LIBS@ -UI_LIBS = @UI_LIBS@ -UNIX_COMPILE_FALSE = @UNIX_COMPILE_FALSE@ -UNIX_COMPILE_TRUE = @UNIX_COMPILE_TRUE@ -UNIX_GP2X_COMPILE_FALSE = @UNIX_GP2X_COMPILE_FALSE@ -UNIX_GP2X_COMPILE_TRUE = @UNIX_GP2X_COMPILE_TRUE@ -UNIX_HPUX_COMPILE_FALSE = @UNIX_HPUX_COMPILE_FALSE@ -UNIX_HPUX_COMPILE_TRUE = @UNIX_HPUX_COMPILE_TRUE@ -UNIX_MACOSX_COMPILE_FALSE = @UNIX_MACOSX_COMPILE_FALSE@ -UNIX_MACOSX_COMPILE_TRUE = @UNIX_MACOSX_COMPILE_TRUE@ -UNIX_MACOSX_UITYPE = @UNIX_MACOSX_UITYPE@ -UNIX_OPENSERVER5_COMPILE_FALSE = @UNIX_OPENSERVER5_COMPILE_FALSE@ -UNIX_OPENSERVER5_COMPILE_TRUE = @UNIX_OPENSERVER5_COMPILE_TRUE@ -UNIX_OPENSERVER6_COMPILE_FALSE = @UNIX_OPENSERVER6_COMPILE_FALSE@ -UNIX_OPENSERVER6_COMPILE_TRUE = @UNIX_OPENSERVER6_COMPILE_TRUE@ -UNIX_QNX4_COMPILE_FALSE = @UNIX_QNX4_COMPILE_FALSE@ -UNIX_QNX4_COMPILE_TRUE = @UNIX_QNX4_COMPILE_TRUE@ -UNIX_QNX6_COMPILE_FALSE = @UNIX_QNX6_COMPILE_FALSE@ -UNIX_QNX6_COMPILE_TRUE = @UNIX_QNX6_COMPILE_TRUE@ -UNIX_SKYOS_COMPILE_FALSE = @UNIX_SKYOS_COMPILE_FALSE@ -UNIX_SKYOS_COMPILE_TRUE = @UNIX_SKYOS_COMPILE_TRUE@ -UNIX_SOLARIS_COMPILE_FALSE = @UNIX_SOLARIS_COMPILE_FALSE@ -UNIX_SOLARIS_COMPILE_TRUE = @UNIX_SOLARIS_COMPILE_TRUE@ -UNIX_UNIXWARE_COMPILE_FALSE = @UNIX_UNIXWARE_COMPILE_FALSE@ -UNIX_UNIXWARE_COMPILE_TRUE = @UNIX_UNIXWARE_COMPILE_TRUE@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_MIDAS_SOUND_FALSE = @USE_MIDAS_SOUND_FALSE@ -USE_MIDAS_SOUND_TRUE = @USE_MIDAS_SOUND_TRUE@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -VERSION_RC = @VERSION_RC@ -VICEDIR = @VICEDIR@ -VICE_LIBPNG = @VICE_LIBPNG@ -VICE_LIBPNG_DEP = @VICE_LIBPNG_DEP@ -VICE_LIBPNG_DIR = @VICE_LIBPNG_DIR@ -VICE_LIBPNG_INCLUDES = @VICE_LIBPNG_INCLUDES@ -VICE_SYNC = @VICE_SYNC@ -VICE_VERSION = @VICE_VERSION@ -VICE_VERSION_BUILD = @VICE_VERSION_BUILD@ -VICE_VERSION_MAJOR = @VICE_VERSION_MAJOR@ -VICE_VERSION_MINOR = @VICE_VERSION_MINOR@ -VICE_ZLIB = @VICE_ZLIB@ -VICE_ZLIB_DEP = @VICE_ZLIB_DEP@ -VICE_ZLIB_DIR = @VICE_ZLIB_DIR@ -VICE_ZLIB_INCLUDES = @VICE_ZLIB_INCLUDES@ -WIN32_COMPILE_FALSE = @WIN32_COMPILE_FALSE@ -WIN32_COMPILE_TRUE = @WIN32_COMPILE_TRUE@ -WINDRES = @WINDRES@ -WRC = @WRC@ -X128_WINRES = @X128_WINRES@ -X64_WINRES = @X64_WINRES@ -XCBM2_WINRES = @XCBM2_WINRES@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XPET_WINRES = @XPET_WINRES@ -XPLUS4_WINRES = @XPLUS4_WINRES@ -XVIC_WINRES = @XVIC_WINRES@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@ -am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -artsc_config = @artsc_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -cxx = @cxx@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sdl_config = @sdl_config@ -sharedstatedir = @sharedstatedir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -x128_LDFLAGS = @x128_LDFLAGS@ -x64_LDFLAGS = @x64_LDFLAGS@ -xcbm2_LDFLAGS = @xcbm2_LDFLAGS@ -xpet_LDFLAGS = @xpet_LDFLAGS@ -xplus4_LDFLAGS = @xplus4_LDFLAGS@ -xvic_LDFLAGS = @xvic_LDFLAGS@ -EXTRA_DIST = \ - amigaos/build-os4-native.sh \ - amigaos/build-vbcc.sh \ - beos/ppc-build.sh \ - mingw32/build-cross.sh \ - macosx/build-allext.sh \ - macosx/build-gtk.sh \ - macosx/build-hidutils.sh \ - macosx/build-inc.sh \ - macosx/build-pcaplibnet.sh \ - macosx/build-readline.sh \ - macosx/build-vice-dist.sh \ - macosx/build-ffmpeglame.sh \ - minix3/build.sh \ - minix3/build-package.sh \ - qnx4/build.sh \ - riscos/build-cross.sh \ - vms/build.sh - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu build/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/amigaos $(distdir)/beos $(distdir)/macosx $(distdir)/mingw32 $(distdir)/minix3 $(distdir)/qnx4 $(distdir)/riscos $(distdir)/vms - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Deleted: branches/marco/ports/vice/configure =================================================================== --- branches/marco/ports/vice/configure 2008-05-18 20:08:16 UTC (rev 18789) +++ branches/marco/ports/vice/configure 2008-05-18 20:20:12 UTC (rev 18790) @@ -1,31403 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61. -# -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH - - -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_requir... [truncated message content] |
From: <cnv...@us...> - 2008-05-18 20:08:29
|
Revision: 18789 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18789&view=rev Author: cnvogelg Date: 2008-05-18 13:08:16 -0700 (Sun, 18 May 2008) Log Message: ----------- chris/cocoa-port: added resource editor with hierarchical resource specification given in ResourceTree.plist Modified Paths: -------------- branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/classes.nib branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/info.nib branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/keyedobjects.nib branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.am branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.h branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.m branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.h branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.m branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.h Added Paths: ----------- branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/ branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/classes.nib branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/info.nib branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/keyedobjects.nib branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceTree.plist branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.h branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.m branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.h branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am 2008-05-18 19:06:43 UTC (rev 18788) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am 2008-05-18 20:08:16 UTC (rev 18789) @@ -19,4 +19,7 @@ KeyboardSettings.nib/keyedobjects.nib JoystickSettings.nib/classes.nib \ JoystickSettings.nib/info.nib \ - JoystickSettings.nib/keyedobjects.nib + JoystickSettings.nib/keyedobjects.nib \ + ResourceEditor.nib/classes.nib \ + ResourceEditor.nib/info.nib \ + ResourceEditor.nib/keyedobjects.nib Added: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/classes.nib =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/classes.nib (rev 0) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/classes.nib 2008-05-18 20:08:16 UTC (rev 18789) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "" rel="nofollow">http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>IBClasses</key> + <array> + <dict> + <key>ACTIONS</key> + <dict> + <key>triggerResourceUpdate</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>VICEResourceWindowController</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSWindowController</string> + </dict> + <dict> + <key>CLASS</key> + <string>ResourceEditorController</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>OUTLETS</key> + <dict> + <key>treeView</key> + <string>NSOutlineView</string> + </dict> + <key>SUPERCLASS</key> + <string>VICEResourceWindowController</string> + </dict> + </array> + <key>IBVersion</key> + <string>1</string> +</dict> +</plist> Added: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/info.nib =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/info.nib (rev 0) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/info.nib 2008-05-18 20:08:16 UTC (rev 18789) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "" rel="nofollow">http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>IBFramework Version</key> + <string>629</string> + <key>IBOldestOS</key> + <integer>3</integer> + <key>IBOpenObjects</key> + <array> + <integer>1</integer> + </array> + <key>IBSystem Version</key> + <string>9C7010</string> + <key>targetFramework</key> + <string>IBCocoaFramework</string> +</dict> +</plist> Added: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/keyedobjects.nib =================================================================== (Binary files differ) Property changes on: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/keyedobjects.nib ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceTree.plist =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceTree.plist (rev 0) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceTree.plist 2008-05-18 20:08:16 UTC (rev 18789) @@ -0,0 +1,195 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "" rel="nofollow">http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>Cartridges</key> + <dict> + <key>256K</key> + <dict> + <key>Base Address</key> + <string>C64_256Kbase,E,$DE00,$DE80,$DF00,$DF80</string> + <key>Enable</key> + <string>C64_256K,b</string> + <key>Image File</key> + <string>C64_256Kfilename,fs</string> + </dict> + <key>ACIA</key> + <dict> + <key>Device</key> + <string>Acia1Dev,e,RS232 Device 1,RS232 Device 2,RS232 Device 3,RS232 Device 4</string> + <key>Enable</key> + <string>Acia1Enable,b</string> + <key>Interrupt</key> + <string>Acia1Irq,e,None,IRQ,NMI</string> + <key>Mode</key> + <string>Acia1Mode,e,Normal,Swiftlink,Turbo232</string> + </dict> + <key>DIGIMAX</key> + <dict> + <key>Base Address</key> + <string>DIGIMAXbase,E,$DD00,$DE00,$DE20,$DE40,$DE60,$DE80,$DEA0,$DEC0,$DEE0,$DF00,$DF20,$DF40,$DF60,$DF80,$DFA0,$DFC0,$DFE0</string> + <key>Enable</key> + <string>DIGIMAX,b</string> + </dict> + <key>GEORAM</key> + <dict> + <key>Enable</key> + <string>GEORAM,b</string> + <key>Image File</key> + <string>GEORAMsize,E,64,128,256,512,1024,2048,4096</string> + <key>Size (KiB)</key> + <string>GEORAMfilename,fs</string> + </dict> + <key>IDE64</key> + <dict> + <key>Autodetect Size</key> + <string>IDE64AutodetectSize,b</string> + <key>Cylinders</key> + <string>IDE64Cylinders,i</string> + <key>HD Image File</key> + <string>IDE64Image,fs</string> + <key>Heads</key> + <string>IDE64Heads,i</string> + <key>Sectors</key> + <string>IDE64Sectors,i</string> + </dict> + <key>MMC64</key> + <dict> + <key>BIOS File</key> + <string>MMC64BIOSfilename,fs</string> + <key>BIOS Revision</key> + <string>MMC64_revision,e,Rev A,Rev B</string> + <key>Enable</key> + <string>MMC64,b</string> + <key>Enable BIOS Flash Jumper</key> + <string>MMC64_flashjumper,b</string> + <key>MMC/SD Image</key> + <string>MMC64imagefilename,fs</string> + <key>MMC/SD Image read-only</key> + <string>MMC64_RO,b</string> + <key>Save BIOS when changed</key> + <string>MMC64_bios_write,b</string> + </dict> + <key>Plus256k</key> + <dict> + <key>Enable</key> + <string>PLUS256K,b</string> + <key>Image File</key> + <string>PLUS256Kfilename,fs</string> + </dict> + <key>Plus60k</key> + <dict> + <key>Base Address</key> + <string>PLUS60Kbase,E,$D040,$D100</string> + <key>Enable</key> + <string>PLUS60K,b</string> + <key>Image File</key> + <string>PLUS60Kfilename,fs</string> + </dict> + <key>RAMCART</key> + <dict> + <key>Enable</key> + <string>RAMCART,b</string> + <key>Image File</key> + <string>RAMCARTfilename,fs</string> + <key>Read Only</key> + <string>RAMCART_RO,b</string> + <key>Size (KiB)</key> + <string>RAMCARTsize,E,64,128</string> + </dict> + <key>REU</key> + <dict> + <key>Enable</key> + <string>REU,b</string> + <key>Image File</key> + <string>REUfilename,fs</string> + <key>Size (KiB)</key> + <string>REUsize,E,128,256,512,1024,2048,4096,8192,16384</string> + </dict> + <key>TFE/RRNet</key> + <dict> + <key>Enable</key> + <string>ETHERNET_ACTIVE,b</string> + <key>Interface</key> + <string>ETHERNET_INTERFACE,s</string> + <key>RRNet</key> + <string>ETHERNET_AS_RR,b</string> + </dict> + </dict> + <key>Datasette</key> + <dict> + <key>Reset with CPU</key> + <string>DatasetteResetWithCPU,b</string> + <key>Speed Tuning</key> + <string>DatasetteSpeedTuning,E,0,1,2,3,4,5,6,7</string> + <key>Zero Gap Delay</key> + <string>DatasetteZeroGapDelay,E,1000,2000,5000,10000,20000,50000,100000</string> + </dict> + <key>Peripherals</key> + <dict> + <key>RS232</key> + <dict> + <key>Device 1</key> + <string>RsDevice1,s</string> + <key>Device 2</key> + <string>RsDevice2,s</string> + <key>Device 3</key> + <string>RsDevice3,s</string> + <key>Device 4</key> + <string>RsDevice4,s</string> + </dict> + <key>Userport RS232</key> + <dict> + <key>Baud Rate</key> + <string>RsUserBaud,E,300,600,1200,2400,4800,9600</string> + <key>Enable</key> + <string>RsUserEnable,b</string> + <key>RS232 Device</key> + <string>RsUserDev,e,Device 1,Device 2,Device 3,Device 4</string> + </dict> + </dict> + <key>RAM</key> + <dict> + <key>Length of constant pattern</key> + <string>RAMInitPatternInvert,i</string> + <key>Length of constant values</key> + <string>RAMInitValueInvert,i</string> + <key>Value of first Byte</key> + <string>RAMInitStartValue,i</string> + </dict> + <key>SID</key> + <dict> + <key>Engine</key> + <string>SidEngine,e,Fast SID,ReSID</string> + <key>Filters</key> + <string>SidFilters,b</string> + <key>Model</key> + <string>SidModel,e,6581,8580</string> + <key>ReSID</key> + <dict> + <key>Passband (0-90%)</key> + <string>SidResidPassband,r,0,90</string> + <key>Sample Method</key> + <string>SidResidSampling,e,Fast,Interpolating,Resampling,Fast Resampling</string> + </dict> + <key>Stereo SID</key> + <dict> + <key>Base Address</key> + <string>SidStereoStartAddress,e,$D4,$D5,$D6,$D7,$DE,$DF</string> + <key>Enable</key> + <string>SidStereo,b</string> + </dict> + </dict> + <key>VIC II</key> + <dict> + <key>Border Mode</key> + <string>VICIIBorderMode,e,Normal,Full,Debug</string> + <key>Check Sprite Background Collision</key> + <string>VICIICheckSbColl,b</string> + <key>Check Sprite Sprite Collision</key> + <string>VICIICheckSsColl,b</string> + <key>New Luminances</key> + <string>VICIINewLuminances,b</string> + </dict> +</dict> +</plist> Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/classes.nib =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/classes.nib 2008-05-18 19:06:43 UTC (rev 18788) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/classes.nib 2008-05-18 20:08:16 UTC (rev 18789) @@ -86,6 +86,8 @@ <string>id</string> <key>showPrinterSettings</key> <string>id</string> + <key>showResourceEditor</key> + <string>id</string> <key>showSoundSettings</key> <string>id</string> <key>smartAttachImage</key> Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/info.nib =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/info.nib 2008-05-18 19:06:43 UTC (rev 18788) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/info.nib 2008-05-18 20:08:16 UTC (rev 18789) @@ -7,7 +7,9 @@ <key>IBOldestOS</key> <integer>3</integer> <key>IBOpenObjects</key> - <array/> + <array> + <integer>405</integer> + </array> <key>IBSystem Version</key> <string>9C7010</string> <key>targetFramework</key> Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.am =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.am 2008-05-18 19:06:43 UTC (rev 18788) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.am 2008-05-18 20:08:16 UTC (rev 18789) @@ -25,7 +25,9 @@ keyboardsettingswindowcontroller.h \ soundsettingswindowcontroller.h \ viceresourcewindowcontroller.h \ - viceinformationwindowcontroller.h + viceinformationwindowcontroller.h \ + resourceeditorcontroller.h \ + resourcetreeitem.h libarchmacosxcocoadialog_a_SOURCES = \ drivesettingswindowcontroller.m \ @@ -35,4 +37,6 @@ keyboardsettingswindowcontroller.m \ soundsettingswindowcontroller.m \ viceresourcewindowcontroller.m \ - viceinformationwindowcontroller.m + viceinformationwindowcontroller.m \ + resourceeditorcontroller.m \ + resourcetreeitem.m Added: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.h =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.h (rev 0) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.h 2008-05-18 20:08:16 UTC (rev 18789) @@ -0,0 +1,38 @@ +/* + * resourceeditorcontroller.h - resource editor window controller + * + * Written by + * Christian Vogelgsang <ch...@vo...> + * + * This file is part of VICE, the Versatile Commodore Emulator. + * See README for copyright notice. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + * 02111-1307 USA. + * + */ + +#import "viceresourcewindowcontroller.h" +#import "resourcetreeitem.h" + +@interface ResourceEditorController : VICEResourceWindowController +{ + ResourceTreeItem *rootItem; + IBOutlet NSOutlineView *treeView; +} + +-(void)reloadItem:(ResourceTreeItem *)item; + +@end Added: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.m =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.m (rev 0) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.m 2008-05-18 20:08:16 UTC (rev 18789) @@ -0,0 +1,171 @@ +/* + * resourceeditorcontroller.m - resource editor window controller + * + * Written by + * Christian Vogelgsang <ch...@vo...> + * + * This file is part of VICE, the Versatile Commodore Emulator. + * See README for copyright notice. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + * 02111-1307 USA. + * + */ + +#include "resourceeditorcontroller.h" + +@implementation ResourceEditorController + +-(id)init +{ + self = [super initWithWindowNibName:@"ResourceEditor"]; + if(!self) + return self; + + [self registerForResourceUpdate:@selector(updateResources:)]; + + // read in resource tree plist + NSDictionary *treeDict = [[NSDictionary alloc] initWithContentsOfFile: + [[NSBundle mainBundle] pathForResource:@"ResourceTree" ofType:@"plist" ] ]; + + // create resource tree items from plist dictionary + rootItem = [[ResourceTreeItem alloc] initWithTitle:@"Root"]; + BOOL ok = [rootItem addFromDictionary:treeDict]; + if(!ok) + NSLog(@"ERROR building ResourceTree!"); + + [treeDict release]; + + return self; +} + +-(void)dealloc +{ + [rootItem release]; + [super dealloc]; +} + +-(void)windowDidLoad +{ + [treeView setDelegate:self]; + [treeView setDataSource:self]; +} + +-(void)updateResources:(NSNotification *)notification +{ + if([notification object] != self) { + NSLog(@"Invalidate Resources"); + [rootItem invalidateCache]; + } + [treeView setNeedsDisplay:TRUE]; +} + +- (NSCell *)outlineView:(NSOutlineView *)outlineView + dataCellForTableColumn:(NSTableColumn *)tableColumn + item:(id)item +{ + if(item==nil) + return nil; + + NSCell *cell = [tableColumn dataCell]; + + ResourceTreeItem *ritem = (ResourceTreeItem *)item; + NSString *colId = (NSString *)[tableColumn identifier]; + if([colId isEqualToString:@"Value"]) { + return [ritem dataCell:cell]; + } else if([colId isEqualToString:@"Extra"]) { + return [ritem extraCell:cell]; + } else { + return cell; + } +} + +-(void)reloadItem:(ResourceTreeItem *)item +{ + [treeView reloadItem:item]; +} + +@end + +@implementation ResourceEditorController (NSOutlineViewDataSource) + +- (int)outlineView:(NSOutlineView *)outlineView + numberOfChildrenOfItem:(id)item +{ + if(item==nil) + return [rootItem numChildren]; + else + return [(ResourceTreeItem *)item numChildren]; +} + +- (BOOL)outlineView:(NSOutlineView *)outlineView + isItemExpandable:(id)item +{ + if(item==nil) + return TRUE; + ResourceTreeItem *ritem = (ResourceTreeItem *)item; + return ![ritem isLeaf]; +} + +- (id)outlineView:(NSOutlineView *)outlineView + child:(int)index + ofItem:(id)item +{ + ResourceTreeItem *ritem; + if(item==nil) + ritem = rootItem; + else + ritem = (ResourceTreeItem *)item; + int max = [ritem numChildren]; + if(index >= max) + return nil; + return [ritem childAtIndex:index]; +} + +- (id)outlineView:(NSOutlineView *)outlineView + objectValueForTableColumn:(NSTableColumn *)tableColumn + byItem:(id)item +{ + if(item==nil) + return nil; + + ResourceTreeItem *ritem = (ResourceTreeItem *)item; + NSString *colId = (NSString *)[tableColumn identifier]; + if([colId isEqualToString:@"Resource"]) { + return [ritem title]; + } else if([colId isEqualToString:@"Value"]) { + return [ritem getValue:self]; + } else { + return @""; + } +} + +- (void)outlineView:(NSOutlineView *)outlineView + setObjectValue:(id)object + forTableColumn:(NSTableColumn *)tableColumn + byItem:(id)item +{ + if(item==nil) + return; + ResourceTreeItem *ritem = (ResourceTreeItem *)item; + NSString *colId = (NSString *)[tableColumn identifier]; + if([colId isEqualToString:@"Value"]) { + [ritem setValue:self toObject:object]; + } else if([colId isEqualToString:@"Extra"]) { + [ritem setValueExtra:self]; + } +} +@end + Added: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.h =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.h (rev 0) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.h 2008-05-18 20:08:16 UTC (rev 18789) @@ -0,0 +1,78 @@ +/* + * resourcetreeitem.m - item of the resource tree + * + * Written by + * Christian Vogelgsang <ch...@vo...> + * + * This file is part of VICE, the Versatile Commodore Emulator. + * See README for copyright notice. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + * 02111-1307 USA. + * + */ + +#import <Cocoa/Cocoa.h> + +#define ResourceTreeItemTypeString 0 // s +#define ResourceTreeItemTypeInteger 1 // i + +#define ResourceTreeItemHintNone 0 +#define ResourceTreeItemHintBoolean 1 // b +#define ResourceTreeItemHintEnum 2 // e +#define ResourceTreeItemHintEnumDirect 3 // E +#define ResourceTreeItemHintRange 4 // r + +#define ResourceTreeItemHintFileOpen 10 // fo +#define ResourceTreeItemHintFileSave 11 // fs +#define ResourceTreeItemHintFileDir 12 // fd + +@interface ResourceTreeItem : NSObject +{ + NSString *title; + NSString *resource; + NSArray *children; + int type; + int hint; + id cacheValue; + NSCell *dataCell; + NSCell *extraCell; + NSArray *args; + int numArgs; +} + +-(id)initWithTitle:(NSString *)t; + +-(BOOL)addFromDictionary:(NSDictionary *)dict; + +-(id)getValue:(id)controller; +-(void)setValue:(id)controller toObject:(id)object; +-(void)setValueExtra:(id)controller; + +-(BOOL)isLeaf; +-(NSString *)title; +-(int)numChildren; +-(ResourceTreeItem *)childAtIndex:(int)index; + +-(BOOL)parseResourceString:(NSString *)string; + +-(void)invalidateCache; + +-(NSCell *)dataCell:(NSCell *)colCell; +-(NSCell *)extraCell:(NSCell *)extraCell; + +-(NSComparisonResult)compare:(ResourceTreeItem *)item; + +@end Added: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m (rev 0) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m 2008-05-18 20:08:16 UTC (rev 18789) @@ -0,0 +1,414 @@ +/* + * resourcetreeitem.m - item of the resource tree + * + * Written by + * Christian Vogelgsang <ch...@vo...> + * + * This file is part of VICE, the Versatile Commodore Emulator. + * See README for copyright notice. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + * 02111-1307 USA. + * + */ + +#import "resourcetreeitem.h" +#import "resourceeditorcontroller.h" + +@implementation ResourceTreeItem + +-(id)initWithTitle:(NSString *)t +{ + self = [super init]; + if(self == nil) + return nil; + + title = [t retain]; + resource = nil; + children = nil; + cacheValue = nil; + dataCell = nil; + extraCell = nil; + + return self; +} + +-(void)dealloc +{ + [title release]; + [resource release]; + [children release]; + [cacheValue release]; + [dataCell release]; + [extraCell release]; + [args release]; + [super dealloc]; +} + +-(BOOL)isLeaf +{ + return children == nil; +} + +-(ResourceTreeItem *)childAtIndex:(int)index +{ + return (ResourceTreeItem *)[children objectAtIndex:index]; +} + +-(int)numChildren +{ + if(children==nil) + return 0; + else + return [children count]; +} + +-(BOOL)addFromDictionary:(NSDictionary *)dict +{ + NSMutableArray *a = [[NSMutableArray alloc] init]; + for(id key in dict) { + ResourceTreeItem *item = [[ResourceTreeItem alloc] initWithTitle:key]; + [a addObject:item]; + + id value = [dict objectForKey:key]; + + // its a dictionary itself + if([value isKindOfClass:[NSDictionary class]]) { + if(![item addFromDictionary:value]) + return FALSE; + } + // its a string + else if([value isKindOfClass:[NSString class]]) { + if(![item parseResourceString:(NSString *)value]) + return FALSE; + } + // unknown + else { + NSLog(@"Invalid Class in Dictionary: %@",[value class]); + return FALSE; + } + } + + // sort array and keep + children = [a sortedArrayUsingSelector:@selector(compare:)]; + [children retain]; + [a release]; + return TRUE; +} + +-(BOOL)parseResourceString:(NSString *)string +{ + args = [string componentsSeparatedByString:@","]; + [args retain]; + numArgs = [args count]; + if(numArgs < 2) { + NSLog(@"ERROR: resource string invalid: %@",string); + return FALSE; + } + + resource = (NSString *)[args objectAtIndex:0]; + [resource retain]; + + NSString *typeStr = (NSString *)[args objectAtIndex:1]; + unichar ch = [typeStr characterAtIndex:0]; + switch(ch) { + case 'i': // integer + type = ResourceTreeItemTypeInteger; + hint = ResourceTreeItemHintNone; + break; + case 'b': // boolean + type = ResourceTreeItemTypeInteger; + hint = ResourceTreeItemHintBoolean; + break; + case 'e': // enum + type = ResourceTreeItemTypeInteger; + hint = ResourceTreeItemHintEnum; + break; + case 'E': // enum direct + type = ResourceTreeItemTypeInteger; + hint = ResourceTreeItemHintEnumDirect; + break; + case 'r': // range + type = ResourceTreeItemTypeInteger; + hint = ResourceTreeItemHintRange; + break; + case 's': // string + type = ResourceTreeItemTypeString; + hint = ResourceTreeItemHintNone; + break; + case 'f': // file + { + unichar mode = [typeStr characterAtIndex:1]; + type = ResourceTreeItemTypeString; + switch(mode) { + case 'o': + hint = ResourceTreeItemHintFileOpen; + break; + case 's': + hint = ResourceTreeItemHintFileSave; + break; + case 'd': + hint = ResourceTreeItemHintFileDir; + break; + default: + NSLog(@"ERROR: Invalid file resource mode: %@",typeStr); + return false; + } + } + break; + default: + NSLog(@"ERROR: Invalid resource type: %@",typeStr); + return FALSE; + } + + return TRUE; +} + +-(NSString *)title +{ + return title; +} + +-(int)parseIntFromString:(NSString *)string +{ + int len = [string length]; + if(len==0) + return 0; + + int value = 0; + const char *str = [string cStringUsingEncoding:NSUTF8StringEncoding]; + if(*str=='$') { + sscanf(str+1,"%x",&value); + } else { + sscanf(str,"%d",&value); + } + return value; +} + +-(id)getValue:(id)ctl +{ + ResourceEditorController *controller = (ResourceEditorController *)ctl; + if([self isLeaf]) { + if(cacheValue == nil) { + if(type == ResourceTreeItemTypeInteger) { + int value = [controller getIntResource:resource]; +// NSLog(@"read integer: %@ %d",resource,value); + + // enum + if(hint == ResourceTreeItemHintEnum) { + cacheValue = [[args objectAtIndex:value+2] retain]; + } + // direct enum + else if(hint == ResourceTreeItemHintEnumDirect) { + int i; + for(i=2;i<numArgs;i++) { + NSString *argString = (NSString *)[args objectAtIndex:i]; + int argValue = [self parseIntFromString:argString]; + if(argValue == value) { + cacheValue = [argString retain]; + break; + } + } + } + // integer + else { + cacheValue = [[NSNumber alloc] initWithInt:value]; + } + } + else { + NSString *value = [controller getStringResource:resource]; +// NSLog(@"read string: %@ %@",resource,value); + cacheValue = [value retain]; + } + } + return cacheValue; + } + else + return @""; +} + +-(void)setIntResourceToValue:(int)value withController:(id)ctl +{ + ResourceEditorController *controller = (ResourceEditorController *)ctl; + [controller setIntResource:resource toValue:value]; + [self invalidateCache]; + [controller reloadItem:self]; +// NSLog(@"set int resource %@ %d",resource,value); +} + +-(void)setStringResourceToValue:(NSString *)value withController:(id)ctl +{ + ResourceEditorController *controller = (ResourceEditorController *)ctl; + [controller setStringResource:resource toValue:value]; + [self invalidateCache]; + [controller reloadItem:self]; +// NSLog(@"set string resource %@ %d",resource,value); +} + +-(void)setValue:(id)ctl toObject:(id)object +{ + NSString *string = (NSString *)object; + if(type == ResourceTreeItemTypeInteger) { + int value = 0; + // enum resource + if(hint==ResourceTreeItemHintEnum || + hint==ResourceTreeItemHintEnumDirect) { + int i; + for(i=2;i<numArgs;i++) { + NSString *argVal = (NSString *)[args objectAtIndex:i]; + if([argVal isEqualToString:string]) { + if(hint==ResourceTreeItemHintEnum) + value = i-2; + else + value = [self parseIntFromString:argVal]; + break; + } + } + } + // range + else if(hint==ResourceTreeItemHintRange) { + if(numArgs==4) { + int min = [[args objectAtIndex:2] intValue]; + int max = [[args objectAtIndex:3] intValue]; + if(value<min) + value = min; + else if(value>max) + value = max; + } else { + NSLog(@"ERROR: range invalid: %@",args); + } + } + // integer resource + else { + value = [string intValue]; + } + [self setIntResourceToValue:value withController:ctl]; + } else { + [self setStringResourceToValue:string withController:ctl]; + } +} + +-(void)setValueExtra:(id)ctl +{ + ResourceEditorController *controller = (ResourceEditorController *)ctl; + BOOL needReload = FALSE; + switch(hint) { + case ResourceTreeItemHintFileOpen: + { + NSString *file = [controller pickOpenFileWithTitle:title types:nil]; + if(file!=nil) + [self setStringResourceToValue:file withController:ctl]; + break; + } + case ResourceTreeItemHintFileSave: + { + NSString *file = [controller pickSaveFileWithTitle:title types:nil]; + if(file!=nil) + [self setStringResourceToValue:file withController:ctl]; + break; + } + case ResourceTreeItemHintFileDir: + { + NSString *file = [controller pickDirectoryWithTitle:title]; + if(file!=nil) + [self setStringResourceToValue:file withController:ctl]; + break; + } + } +} + +-(NSCell *)dataCell:(NSCell *)colCell +{ + if([self isLeaf]) { + if(dataCell!=nil) + return dataCell; + + switch(hint) { + // boolean cell + case ResourceTreeItemHintBoolean: + { + NSButtonCell *bcell = [[NSButtonCell alloc] initTextCell:@""]; + [bcell setButtonType:NSSwitchButton]; + dataCell = bcell; + break; + } + case ResourceTreeItemHintEnum: + case ResourceTreeItemHintEnumDirect: + { + NSComboBoxCell *ccell = [[NSComboBoxCell alloc] initTextCell:@""]; + int i; + [ccell setButtonBordered:FALSE]; + for(i=2;i<numArgs;i++) { + [ccell addItemWithObjectValue:[args objectAtIndex:i]]; + } + dataCell = ccell; + break; + } + default: + return colCell; + } + // reuse default font + [dataCell setFont:[colCell font]]; + return dataCell; + } + return colCell; +} + +-(NSCell *)extraCell:(NSCell *)colCell +{ + if([self isLeaf]) { + if(extraCell!=nil) { + return extraCell; + } + + switch(hint) { + // file name cell + case ResourceTreeItemHintFileOpen: + case ResourceTreeItemHintFileSave: + case ResourceTreeItemHintFileDir: + { + NSButtonCell *bcell = [[NSButtonCell alloc] initTextCell:@""]; + [bcell setButtonType:NSMomentaryLightButton]; + [bcell setTitle:@"..."]; + extraCell = bcell; + break; + } + default: + return colCell; + } + [extraCell setFont:[colCell font]]; + return extraCell; + } + return colCell; +} + +-(NSComparisonResult)compare:(ResourceTreeItem *)item +{ + return [title caseInsensitiveCompare:[item title]]; +} + +-(void)invalidateCache +{ + if([self isLeaf]) { + [cacheValue release]; + cacheValue = nil; + } else { + for(id item in children) { + [(ResourceTreeItem *)item invalidateCache]; + } + } +} + +@end Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.h =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.h 2008-05-18 19:06:43 UTC (rev 18788) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.h 2008-05-18 20:08:16 UTC (rev 18789) @@ -45,4 +45,9 @@ -(BOOL)setStringResource:(NSString *)name toValue:(NSString *)string; -(BOOL)setStringResource:(NSString *)name withNumber:(int)number toValue:(NSString *)string; +// File Tools +- (NSString *)pickOpenFileWithTitle:(NSString *)title types:(NSArray *)types; +- (NSString *)pickSaveFileWithTitle:(NSString *)title types:(NSArray *)types; +- (NSString *)pickDirectoryWithTitle:(NSString *)title; + @end Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.m =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.m 2008-05-18 19:06:43 UTC (rev 18788) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.m 2008-05-18 20:08:16 UTC (rev 18789) @@ -101,4 +101,21 @@ return [self setStringResource:formatString toValue:string]; } +// ----- File Tools ----- + +- (NSString *)pickOpenFileWithTitle:(NSString *)title types:(NSArray *)types +{ + return [[VICEApplication theAppController] pickOpenFileWithTitle:title types:types]; +} + +- (NSString *)pickSaveFileWithTitle:(NSString *)title types:(NSArray *)types +{ + return [[VICEApplication theAppController] pickSaveFileWithTitle:title types:types]; +} + +- (NSString *)pickDirectoryWithTitle:(NSString *)title +{ + return [[VICEApplication theAppController] pickDirectoryWithTitle:title]; +} + @end Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.h =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.h 2008-05-18 19:06:43 UTC (rev 18788) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.h 2008-05-18 20:08:16 UTC (rev 18789) @@ -32,6 +32,7 @@ #import "joysticksettingswindowcontroller.h" #import "soundsettingswindowcontroller.h" #import "viceinformationwindowcontroller.h" +#import "resourceeditorcontroller.h" @interface VICEAppController : NSObject { @@ -43,6 +44,7 @@ JoystickSettingsWindowController *joystickSettingsController; SoundSettingsWindowController *soundSettingsController; VICEInformationWindowController *infoController; + ResourceEditorController *resourceEditorController; // Options Outlets IBOutlet NSMenu *refreshRateMenu; @@ -114,6 +116,7 @@ - (IBAction)showSoundSettings:(id)sender; // Resources +- (IBAction)showResourceEditor:(id)sender; - (IBAction)saveResources:(id)sender; - (IBAction)loadResources:(id)sender; - (IBAction)resetResources:(id)sender; @@ -126,6 +129,7 @@ // Tools - (NSString *)pickOpenFileWithTitle:(NSString *)title types:(NSArray *)types; - (NSString *)pickSaveFileWithTitle:(NSString *)title types:(NSArray *)types; +- (NSString *)pickDirectoryWithTitle:(NSString *)title; - (void)attachDiskImageForUnit:(int)unit; Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.m =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.m 2008-05-18 19:06:43 UTC (rev 18788) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.m 2008-05-18 20:08:16 UTC (rev 18789) @@ -47,8 +47,12 @@ // release dialog controllers [driveSettingsController release]; [iecDriveSettingsController release]; + [printerSettingsController release]; + [keyboardSettingsController release]; [joystickSettingsController release]; + [soundSettingsController release]; [infoController release]; + [resourceEditorController release]; [super dealloc]; } @@ -404,6 +408,14 @@ // ----- Resources ----- +- (IBAction)showResourceEditor:(id)sender +{ + if(!resourceEditorController) { + resourceEditorController = [[ResourceEditorController alloc] init]; + } + [resourceEditorController showWindow:self]; +} + - (IBAction)saveResources:(id)sender { if(![[VICEApplication theMachineController] saveResources:nil]) { @@ -549,6 +561,11 @@ return nil; } +- (NSString *)pickDirectoryWithTitle:(NSString *)title +{ + return nil; +} + - (BOOL)setIntResource:(NSString *)name toValue:(int)value { [[VICEApplication theMachineController] Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.h =================================================================== --- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.h 2008-05-18 19:06:43 UTC (rev 18788) +++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.h 2008-05-18 20:08:16 UTC (rev 18789) @@ -73,6 +73,14 @@ // save a quick snapshot to a file -(void)saveQuickSnapshot; +// ----- Screenshot ----- +// save s screen shot +-(BOOL)saveScreenshot:(NSString *)path withDriver:(NSString *)driver; +// is recording a screenshot +-(BOOL)isRecordingScreenshot; +// stop recording screenshot +-(BOOL)stopRecordingScreenshot; + // ----- Keyboard ----- // key pressed -(void)keyPressed:(unsigned int)code; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-05-18 19:07:27
|
Revision: 18788 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18788&view=rev Author: strik Date: 2008-05-18 12:06:43 -0700 (Sun, 18 May 2008) Log Message: ----------- Small rework of the break64() signal handling code for Win32. Modified Paths: -------------- trunk/vice/src/ChangeLog trunk/vice/src/arch/win32/signals.c Modified: trunk/vice/src/ChangeLog =================================================================== --- trunk/vice/src/ChangeLog 2008-05-18 16:52:47 UTC (rev 18787) +++ trunk/vice/src/ChangeLog 2008-05-18 19:06:43 UTC (rev 18788) @@ -1,6 +1,6 @@ 2008-05-18 Spiro Trikaliotis <spi...@gm...> - * src/arch/win32/signals.c: break64() now has a full back text + * src/arch/win32/signals.c: break64() now has a full backup text in case translate_text() fails. This prevents empty dialog boxes in the case of an error, which occurs rather frequently on Windows, as these calls fail. Modified: trunk/vice/src/arch/win32/signals.c =================================================================== --- trunk/vice/src/arch/win32/signals.c 2008-05-18 16:52:47 UTC (rev 18787) +++ trunk/vice/src/arch/win32/signals.c 2008-05-18 19:06:43 UTC (rev 18788) @@ -43,19 +43,27 @@ #include "ui.h" +static const char * translated_text = "An unexpected error occurred. Received signal %d (%s)."; + +static void get_translated_text(void) +{ + const char * new_translated_text; + + new_translated_text = translate_text(IDS_RECEIVED_SIGNAL_D_S); + + if (new_translated_text != 0 && *new_translated_text != 0) { + translated_text = new_translated_text; + } +} + static RETSIGTYPE break64(int sig) { - const char * translated_text; const char * signalname = ""; - translated_text = translate_text(IDS_RECEIVED_SIGNAL_D_S); + get_translated_text(); /* provide a default text in case we could not translated the text. */ - if (0 == translated_text || 0 == *translated_text) { - translated_text = "An unexpected error occured. Received signal %d (%s)."; - } - #ifdef SYS_SIGLIST_DECLARED signalname = sys_siglist[sig] #endif @@ -71,6 +79,9 @@ signal(SIGTERM, break64); if (!do_core_dumps) { + + get_translated_text(); + signal(SIGSEGV, break64); signal(SIGILL, break64); signal(SIGFPE, break64); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-05-18 16:52:44
|
Revision: 18787 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18787&view=rev Author: strik Date: 2008-05-18 09:52:47 -0700 (Sun, 18 May 2008) Log Message: ----------- 2008-05-18 Spiro Trikaliotis <spi...@gm...> * src/arch/win32/signals.c: break64() now has a full back text in case translate_text() fails. This prevents empty dialog boxes in the case of an error, which occurs rather frequently on Windows, as these calls fail. Modified Paths: -------------- trunk/vice/src/ChangeLog trunk/vice/src/arch/win32/signals.c Modified: trunk/vice/src/ChangeLog =================================================================== --- trunk/vice/src/ChangeLog 2008-05-18 16:32:00 UTC (rev 18786) +++ trunk/vice/src/ChangeLog 2008-05-18 16:52:47 UTC (rev 18787) @@ -1,5 +1,12 @@ 2008-05-18 Spiro Trikaliotis <spi...@gm...> + * src/arch/win32/signals.c: break64() now has a full back text + in case translate_text() fails. This prevents empty dialog boxes + in the case of an error, which occurs rather frequently on + Windows, as these calls fail. + +2008-05-18 Spiro Trikaliotis <spi...@gm...> + * Version 1.22.15. 2008-05-18 Marco van den Heuvel <bla...@ya...> Modified: trunk/vice/src/arch/win32/signals.c =================================================================== --- trunk/vice/src/arch/win32/signals.c 2008-05-18 16:32:00 UTC (rev 18786) +++ trunk/vice/src/arch/win32/signals.c 2008-05-18 16:52:47 UTC (rev 18787) @@ -45,13 +45,23 @@ static RETSIGTYPE break64(int sig) { + const char * translated_text; + const char * signalname = ""; + + translated_text = translate_text(IDS_RECEIVED_SIGNAL_D_S); + + /* provide a default text in case we could not translated the text. */ + + if (0 == translated_text || 0 == *translated_text) { + translated_text = "An unexpected error occured. Received signal %d (%s)."; + } + #ifdef SYS_SIGLIST_DECLARED - ui_error(translate_text(IDS_RECEIVED_SIGNAL_D_S), - sig, sys_siglist[sig]); -#else - ui_error(translate_text(IDS_RECEIVED_SIGNAL_D_S), sig); + signalname = sys_siglist[sig] #endif + ui_error(translated_text, sig, signalname); + exit(-1); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-05-18 16:31:57
|
Revision: 18786 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18786&view=rev Author: strik Date: 2008-05-18 09:32:00 -0700 (Sun, 18 May 2008) Log Message: ----------- Version 1.22.5. Added Paths: ----------- tags/v1.22/v1.22.15/ Copied: tags/v1.22/v1.22.15 (from rev 18785, trunk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-05-18 16:29:37
|
Revision: 18785 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18785&view=rev Author: strik Date: 2008-05-18 09:29:30 -0700 (Sun, 18 May 2008) Log Message: ----------- 2008-05-18 Spiro Trikaliotis <spi...@gm...> * Version 1.22.15. Modified Paths: -------------- trunk/vice/ChangeLog trunk/vice/configure.in trunk/vice/po/vice.pot trunk/vice/src/ChangeLog trunk/vice/src/version.h Modified: trunk/vice/ChangeLog =================================================================== --- trunk/vice/ChangeLog 2008-05-18 16:23:58 UTC (rev 18784) +++ trunk/vice/ChangeLog 2008-05-18 16:29:30 UTC (rev 18785) @@ -1,3 +1,7 @@ +2008-05-18 Spiro Trikaliotis <spi...@gm...> + + * Version 1.22.15. + 2008-05-16 Marco van den Heuvel <bla...@ya...> * doc/html/Makefile.am, doc/Makefile.am: Changed the way the Modified: trunk/vice/configure.in =================================================================== --- trunk/vice/configure.in 2008-05-18 16:23:58 UTC (rev 18784) +++ trunk/vice/configure.in 2008-05-18 16:29:30 UTC (rev 18785) @@ -9,7 +9,7 @@ VICE_VERSION_MAJOR=1 VICE_VERSION_MINOR=22 -VICE_VERSION_BUILD=14 +VICE_VERSION_BUILD=15 AC_SUBST(VICE_VERSION_MAJOR) AC_SUBST(VICE_VERSION_MINOR) Modified: trunk/vice/po/vice.pot =================================================================== --- trunk/vice/po/vice.pot 2008-05-18 16:23:58 UTC (rev 18784) +++ trunk/vice/po/vice.pot 2008-05-18 16:29:30 UTC (rev 18785) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-07 19:29+0200\n" +"POT-Creation-Date: 2008-05-18 18:27+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -5517,7 +5517,7 @@ "IRQ: %s" msgstr "" -#: src/arch/unix/x11/gnome/uifileentry.c:52 +#: src/arch/unix/x11/gnome/uifileentry.c:53 #: src/arch/unix/x11/gnome/x11ui.c:2496 msgid "all files" msgstr "" Modified: trunk/vice/src/ChangeLog =================================================================== --- trunk/vice/src/ChangeLog 2008-05-18 16:23:58 UTC (rev 18784) +++ trunk/vice/src/ChangeLog 2008-05-18 16:29:30 UTC (rev 18785) @@ -1,3 +1,7 @@ +2008-05-18 Spiro Trikaliotis <spi...@gm...> + + * Version 1.22.15. + 2008-05-18 Marco van den Heuvel <bla...@ya...> * arch/amigaos/uiapi.c, arch/win32/ui-resources.c: The Modified: trunk/vice/src/version.h =================================================================== --- trunk/vice/src/version.h 2008-05-18 16:23:58 UTC (rev 18784) +++ trunk/vice/src/version.h 2008-05-18 16:29:30 UTC (rev 18785) @@ -28,11 +28,11 @@ #define __VERSION_H__ #ifndef VERSION -#define VERSION "1.22.14" +#define VERSION "1.22.15" #endif #ifndef VERSION_RC_NUMBER -#define VERSION_RC_NUMBER 1,22,14,0 +#define VERSION_RC_NUMBER 1,22,15,0 #endif #ifndef PACKAGE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-05-18 16:23:57
|
Revision: 18784 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18784&view=rev Author: strik Date: 2008-05-18 09:23:58 -0700 (Sun, 18 May 2008) Log Message: ----------- 2008-05-18 Marco van den Heuvel <bla...@ya...> * arch/amigaos/uiapi.c, arch/win32/ui-resources.c: The -confirmexit/+confirmexit (both platforms) and -singlecpu/+singlecpu (Win32 only) command-line options had a reversed logic for switching on and off w.r.t. the documentation; fixed that. Modified Paths: -------------- trunk/vice/src/ChangeLog trunk/vice/src/arch/amigaos/uiapi.c trunk/vice/src/arch/win32/ui-resources.c Modified: trunk/vice/src/ChangeLog =================================================================== --- trunk/vice/src/ChangeLog 2008-05-18 13:11:06 UTC (rev 18783) +++ trunk/vice/src/ChangeLog 2008-05-18 16:23:58 UTC (rev 18784) @@ -1,3 +1,11 @@ +2008-05-18 Marco van den Heuvel <bla...@ya...> + + * arch/amigaos/uiapi.c, arch/win32/ui-resources.c: The + -confirmexit/+confirmexit (both platforms) and + -singlecpu/+singlecpu (Win32 only) command-line options had a + reversed logic for switching on and off w.r.t. the + documentation; fixed that. + 2008-05-16 Marco van den Heuvel <bla...@ya...> * ioutil.c: Riscos already has getcwd, even though it's not Modified: trunk/vice/src/arch/amigaos/uiapi.c =================================================================== --- trunk/vice/src/arch/amigaos/uiapi.c 2008-05-18 13:11:06 UTC (rev 18783) +++ trunk/vice/src/arch/amigaos/uiapi.c 2008-05-18 16:23:58 UTC (rev 18784) @@ -220,10 +220,10 @@ "SaveResourcesOnExit", (resource_value_t)0, 0, IDS_NEVER_SAVE_SETTINGS_EXIT }, { "-confirmexit", SET_RESOURCE, 0, NULL, NULL, - "ConfirmOnExit", (resource_value_t)0, + "ConfirmOnExit", (resource_value_t)1, 0, IDS_CONFIRM_QUITING_VICE }, { "+confirmexit", SET_RESOURCE, 0, NULL, NULL, - "ConfirmOnExit", (resource_value_t)1, + "ConfirmOnExit", (resource_value_t)0, 0, IDS_NEVER_CONFIRM_QUITING_VICE }, { NULL } }; Modified: trunk/vice/src/arch/win32/ui-resources.c =================================================================== --- trunk/vice/src/arch/win32/ui-resources.c 2008-05-18 13:11:06 UTC (rev 18783) +++ trunk/vice/src/arch/win32/ui-resources.c 2008-05-18 16:23:58 UTC (rev 18784) @@ -271,16 +271,16 @@ "SaveResourcesOnExit", (resource_value_t)0, 0, IDS_NO_SAVE_SETTINGS_ON_EXIT }, { "-confirmexit", SET_RESOURCE, 0, NULL, NULL, - "ConfirmOnExit", (resource_value_t)0, + "ConfirmOnExit", (resource_value_t)1, 0, IDS_CONFIRM_QUIT_VICE }, { "+confirmexit", SET_RESOURCE, 0, NULL, NULL, - "ConfirmOnExit", (resource_value_t)1, + "ConfirmOnExit", (resource_value_t)0, 0, IDS_NO_CONFIRM_QUIT_VICE }, { "-singlecpu", SET_RESOURCE, 0, NULL, NULL, - "SingleCPU", (resource_value_t)0, + "SingleCPU", (resource_value_t)1, 0, IDS_USE_ALL_CPU_SMP }, { "+singlecpu", SET_RESOURCE, 0, NULL, NULL, - "SingleCPU", (resource_value_t)1, + "SingleCPU", (resource_value_t)0, 0, IDS_USE_FIRST_CPU_SMP }, { NULL } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-05-18 13:11:05
|
Revision: 18783 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18783&view=rev Author: strik Date: 2008-05-18 06:11:06 -0700 (Sun, 18 May 2008) Log Message: ----------- 2008-05-16 Marco van den Heuvel <bla...@ya...> * doc/html/Makefile.am, doc/Makefile.am: Changed the way the docdir is dealt with, old way made some autotools versions end up with an error. 2008-05-16 Marco van den Heuvel <bla...@ya...> * ioutil.c: Riscos already has getcwd, even though it's not detected by configure. * arch/win32/watcom/maincpu.tgt: Added extra parameters for the generation of menuid.h. * arch/win32/watcom/config.h, arch/os2/watcom/config.h, arch/os2/vac++/config.h: Added '#define HAVE_GETCWD'. 2008-05-13 Spiro Trikaliotis <spi...@gm...> * autogen.sh: generates (almost) all files which can be auto-generated. Exceptions: Files which are needed for platforms which cannot built them themselves, or which are deliberately changed from the auto-generated forms. These files are: config.guess, config.sub (deliberately changed), and src/monitor/mon_parse.c, src/monitor/mon_parse.h, src/monitor/mon_lex.c (their absense would break compilation for some platforms). * src/config.h.in, doc/texinfo.tex, po/cat-id-tbl.c, */Makefile.in: removed files which can be auto-generated. * monitor/Makefile.am: remove mon_parse.h from BUILT_SOURCES file, because make complains that it cannot build it. Modified Paths: -------------- trunk/vice/ChangeLog trunk/vice/doc/Makefile.am trunk/vice/doc/html/Makefile.am trunk/vice/src/ChangeLog trunk/vice/src/arch/os2/vac++/config.h trunk/vice/src/arch/os2/watcom/config.h trunk/vice/src/arch/win32/watcom/config.h trunk/vice/src/arch/win32/watcom/maincpu.tgt trunk/vice/src/ioutil.c trunk/vice/src/monitor/Makefile.am Added Paths: ----------- trunk/vice/autogen.sh Removed Paths: ------------- trunk/vice/Makefile.in trunk/vice/build/Makefile.in trunk/vice/configure trunk/vice/data/C128/Makefile.in trunk/vice/data/C64/Makefile.in trunk/vice/data/CBM-II/Makefile.in trunk/vice/data/DRIVES/Makefile.in trunk/vice/data/Makefile.in trunk/vice/data/PET/Makefile.in trunk/vice/data/PLUS4/Makefile.in trunk/vice/data/PRINTER/Makefile.in trunk/vice/data/VIC20/Makefile.in trunk/vice/data/fonts/Makefile.in trunk/vice/doc/Makefile.in trunk/vice/doc/html/Makefile.in trunk/vice/doc/texinfo.tex trunk/vice/man/Makefile.in trunk/vice/po/cat-id-tbl.c trunk/vice/src/Makefile.in trunk/vice/src/arch/Makefile.in trunk/vice/src/arch/amigaos/Makefile.in trunk/vice/src/arch/beos/Makefile.in trunk/vice/src/arch/msdos/Makefile.in trunk/vice/src/arch/os2/Makefile.in trunk/vice/src/arch/os2/dialogs/Makefile.in trunk/vice/src/arch/os2/kbd/Makefile.in trunk/vice/src/arch/os2/snippets/Makefile.in trunk/vice/src/arch/os2/vac++/Makefile.in trunk/vice/src/arch/riscos/Makefile.in trunk/vice/src/arch/unix/Makefile.in trunk/vice/src/arch/unix/gp2x/Makefile.in trunk/vice/src/arch/unix/gui/Makefile.in trunk/vice/src/arch/unix/macosx/Makefile.in trunk/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.in trunk/vice/src/arch/unix/macosx/Resources/Makefile.in trunk/vice/src/arch/unix/macosx/cocoa/Makefile.in trunk/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.in trunk/vice/src/arch/unix/macosx/cocoa/menu/Makefile.in trunk/vice/src/arch/unix/macosx/cocoa/view/Makefile.in trunk/vice/src/arch/unix/readline/Makefile.in trunk/vice/src/arch/unix/x11/Makefile.in trunk/vice/src/arch/unix/x11/gnome/Makefile.in trunk/vice/src/arch/unix/x11/xaw/Makefile.in trunk/vice/src/arch/unix/x11/xaw/widgets/Makefile.in trunk/vice/src/arch/win32/Makefile.in trunk/vice/src/arch/win32/utils/Makefile.in trunk/vice/src/c128/Makefile.in trunk/vice/src/c64/Makefile.in trunk/vice/src/c64/cart/Makefile.in trunk/vice/src/cbm2/Makefile.in trunk/vice/src/config.h.in trunk/vice/src/core/Makefile.in trunk/vice/src/crtc/Makefile.in trunk/vice/src/diskimage/Makefile.in trunk/vice/src/drive/Makefile.in trunk/vice/src/drive/iec/Makefile.in trunk/vice/src/drive/iec/c64exp/Makefile.in trunk/vice/src/drive/iec/plus4exp/Makefile.in trunk/vice/src/drive/iec128dcr/Makefile.in trunk/vice/src/drive/iecieee/Makefile.in trunk/vice/src/drive/ieee/Makefile.in trunk/vice/src/drive/tcbm/Makefile.in trunk/vice/src/fileio/Makefile.in trunk/vice/src/fsdevice/Makefile.in trunk/vice/src/gfxoutputdrv/Makefile.in trunk/vice/src/iecbus/Makefile.in trunk/vice/src/imagecontents/Makefile.in trunk/vice/src/lib/Makefile.in trunk/vice/src/lib/lpng/Makefile.in trunk/vice/src/lib/zlib/Makefile.in trunk/vice/src/monitor/Makefile.in trunk/vice/src/parallel/Makefile.in trunk/vice/src/pet/Makefile.in trunk/vice/src/plus4/Makefile.in trunk/vice/src/printerdrv/Makefile.in trunk/vice/src/raster/Makefile.in trunk/vice/src/resid/Makefile.in trunk/vice/src/rs232drv/Makefile.in trunk/vice/src/serial/Makefile.in trunk/vice/src/sid/Makefile.in trunk/vice/src/sounddrv/Makefile.in trunk/vice/src/tape/Makefile.in trunk/vice/src/vdc/Makefile.in trunk/vice/src/vdrive/Makefile.in trunk/vice/src/vic20/Makefile.in trunk/vice/src/vicii/Makefile.in trunk/vice/src/video/Makefile.in Modified: trunk/vice/ChangeLog =================================================================== --- trunk/vice/ChangeLog 2008-05-18 12:22:18 UTC (rev 18782) +++ trunk/vice/ChangeLog 2008-05-18 13:11:06 UTC (rev 18783) @@ -1,3 +1,23 @@ +2008-05-16 Marco van den Heuvel <bla...@ya...> + + * doc/html/Makefile.am, doc/Makefile.am: Changed the way the + docdir is dealt with, old way made some autotools versions end + up with an error. + +2008-05-13 Spiro Trikaliotis <spi...@gm...> + + * autogen.sh: generates (almost) all files which can be + auto-generated. Exceptions: Files which are needed for platforms + which cannot built them themselves, or which are deliberately + changed from the auto-generated forms. These files are: + config.guess, config.sub (deliberately changed), and + src/monitor/mon_parse.c, src/monitor/mon_parse.h, + src/monitor/mon_lex.c (their absense would break compilation for + some platforms). + + * src/config.h.in, doc/texinfo.tex, po/cat-id-tbl.c, + */Makefile.in: removed files which can be auto-generated. + 2008-05-07 Spiro Trikaliotis <spi...@gm...> * Version 1.22.14. Deleted: trunk/vice/Makefile.in =================================================================== --- trunk/vice/Makefile.in 2008-05-18 12:22:18 UTC (rev 18782) +++ trunk/vice/Makefile.in 2008-05-18 13:11:06 UTC (rev 18783) @@ -1,869 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# Process this file with automake to produce Makefile.in -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS config.guess config.sub depcomp \ - install-sh missing mkinstalldirs -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -ALTERNATE_DOCDIR_FALSE = @ALTERNATE_DOCDIR_FALSE@ -ALTERNATE_DOCDIR_TRUE = @ALTERNATE_DOCDIR_TRUE@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMIGA_COMPILE_FALSE = @AMIGA_COMPILE_FALSE@ -AMIGA_COMPILE_TRUE = @AMIGA_COMPILE_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -ARCH_DIR = @ARCH_DIR@ -ARCH_EXTRA_SUBDIR = @ARCH_EXTRA_SUBDIR@ -ARCH_INCLUDES = @ARCH_INCLUDES@ -ARCH_LIBS = @ARCH_LIBS@ -ARCH_SRC_DIR = @ARCH_SRC_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BEOS_COMPILE_FALSE = @BEOS_COMPILE_FALSE@ -BEOS_COMPILE_TRUE = @BEOS_COMPILE_TRUE@ -BINDIR = @BINDIR@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CROSS = @CROSS@ -CROSS_FALSE = @CROSS_FALSE@ -CROSS_TRUE = @CROSS_TRUE@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DOS_TFE_PCAP_LIB = @DOS_TFE_PCAP_LIB@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FCCACHE = @FCCACHE@ -FFMPEG_INCLUDES = @FFMPEG_INCLUDES@ -FFMPEG_LIBS = @FFMPEG_LIBS@ -FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@ -GENCAT = @GENCAT@ -GFXOUTPUT_DRIVERS = @GFXOUTPUT_DRIVERS@ -GFXOUTPUT_LIBS = @GFXOUTPUT_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_FALSE = @GNOMEUI_FALSE@ -GNOMEUI_TRUE = @GNOMEUI_TRUE@ -GREP = @GREP@ -GTKGL_CFLAGS = @GTKGL_CFLAGS@ -GTKGL_LIBS = @GTKGL_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HAVE_FC_CACHE_FALSE = @HAVE_FC_CACHE_FALSE@ -HAVE_FC_CACHE_TRUE = @HAVE_FC_CACHE_TRUE@ -HAVE_RAWDRIVE_FALSE = @HAVE_RAWDRIVE_FALSE@ -HAVE_RAWDRIVE_TRUE = @HAVE_RAWDRIVE_TRUE@ -HAVE_READLINE = @HAVE_READLINE@ -HAVE_REALDEVICE_FALSE = @HAVE_REALDEVICE_FALSE@ -HAVE_REALDEVICE_TRUE = @HAVE_REALDEVICE_TRUE@ -HAVE_RESID_FALSE = @HAVE_RESID_FALSE@ -HAVE_RESID_TRUE = @HAVE_RESID_TRUE@ -HAVE_RS232_FALSE = @HAVE_RS232_FALSE@ -HAVE_RS232_TRUE = @HAVE_RS232_TRUE@ -HAVE_TRANSLATION_FALSE = @HAVE_TRANSLATION_FALSE@ -HAVE_TRANSLATION_TRUE = @HAVE_TRANSLATION_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -JOY_LIBS = @JOY_LIBS@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LINKCC = @LINKCC@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MACOSX_COCOA_FALSE = @MACOSX_COCOA_FALSE@ -MACOSX_COCOA_TRUE = @MACOSX_COCOA_TRUE@ -MAKEINFO = @MAKEINFO@ -MAKE_BINDIST_FALSE = @MAKE_BINDIST_FALSE@ -MAKE_BINDIST_TRUE = @MAKE_BINDIST_TRUE@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSDOS_COMPILE_FALSE = @MSDOS_COMPILE_FALSE@ -MSDOS_COMPILE_TRUE = @MSDOS_COMPILE_TRUE@ -MSGFMT = @MSGFMT@ -NEED_READLINE_FALSE = @NEED_READLINE_FALSE@ -NEED_READLINE_TRUE = @NEED_READLINE_TRUE@ -NETPLAY_LIBS = @NETPLAY_LIBS@ -NLS_LOCALEDIR = @NLS_LOCALEDIR@ -OBJC = @OBJC@ -OBJCDEPMODE = @OBJCDEPMODE@ -OBJCFLAGS = @OBJCFLAGS@ -OBJEXT = @OBJEXT@ -OS2_COMPILE_FALSE = @OS2_COMPILE_FALSE@ -OS2_COMPILE_TRUE = @OS2_COMPILE_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PKG_CONFIG = @PKG_CONFIG@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -READLINE = @READLINE@ -READLINE_LIBS = @READLINE_LIBS@ -RESID_DEP = @RESID_DEP@ -RESID_DIR = @RESID_DIR@ -RESID_INCLUDES = @RESID_INCLUDES@ -RESID_LIBS = @RESID_LIBS@ -RISCOS_COMPILE_FALSE = @RISCOS_COMPILE_FALSE@ -RISCOS_COMPILE_TRUE = @RISCOS_COMPILE_TRUE@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SOUND_AIX_OBJ = @SOUND_AIX_OBJ@ -SOUND_DRIVERS = @SOUND_DRIVERS@ -SOUND_HPUX_OBJ = @SOUND_HPUX_OBJ@ -SOUND_LIBS = @SOUND_LIBS@ -SOUND_MIDAS_OBJ = @SOUND_MIDAS_OBJ@ -SOUND_SDL_OBJ = @SOUND_SDL_OBJ@ -SOUND_SGI_OBJ = @SOUND_SGI_OBJ@ -SOUND_USS_OBJ = @SOUND_USS_OBJ@ -STRIP = @STRIP@ -TFE_LIBS = @TFE_LIBS@ -UI_LIBS = @UI_LIBS@ -UNIX_COMPILE_FALSE = @UNIX_COMPILE_FALSE@ -UNIX_COMPILE_TRUE = @UNIX_COMPILE_TRUE@ -UNIX_GP2X_COMPILE_FALSE = @UNIX_GP2X_COMPILE_FALSE@ -UNIX_GP2X_COMPILE_TRUE = @UNIX_GP2X_COMPILE_TRUE@ -UNIX_HPUX_COMPILE_FALSE = @UNIX_HPUX_COMPILE_FALSE@ -UNIX_HPUX_COMPILE_TRUE = @UNIX_HPUX_COMPILE_TRUE@ -UNIX_MACOSX_COMPILE_FALSE = @UNIX_MACOSX_COMPILE_FALSE@ -UNIX_MACOSX_COMPILE_TRUE = @UNIX_MACOSX_COMPILE_TRUE@ -UNIX_MACOSX_UITYPE = @UNIX_MACOSX_UITYPE@ -UNIX_OPENSERVER5_COMPILE_FALSE = @UNIX_OPENSERVER5_COMPILE_FALSE@ -UNIX_OPENSERVER5_COMPILE_TRUE = @UNIX_OPENSERVER5_COMPILE_TRUE@ -UNIX_OPENSERVER6_COMPILE_FALSE = @UNIX_OPENSERVER6_COMPILE_FALSE@ -UNIX_OPENSERVER6_COMPILE_TRUE = @UNIX_OPENSERVER6_COMPILE_TRUE@ -UNIX_QNX4_COMPILE_FALSE = @UNIX_QNX4_COMPILE_FALSE@ -UNIX_QNX4_COMPILE_TRUE = @UNIX_QNX4_COMPILE_TRUE@ -UNIX_QNX6_COMPILE_FALSE = @UNIX_QNX6_COMPILE_FALSE@ -UNIX_QNX6_COMPILE_TRUE = @UNIX_QNX6_COMPILE_TRUE@ -UNIX_SKYOS_COMPILE_FALSE = @UNIX_SKYOS_COMPILE_FALSE@ -UNIX_SKYOS_COMPILE_TRUE = @UNIX_SKYOS_COMPILE_TRUE@ -UNIX_SOLARIS_COMPILE_FALSE = @UNIX_SOLARIS_COMPILE_FALSE@ -UNIX_SOLARIS_COMPILE_TRUE = @UNIX_SOLARIS_COMPILE_TRUE@ -UNIX_UNIXWARE_COMPILE_FALSE = @UNIX_UNIXWARE_COMPILE_FALSE@ -UNIX_UNIXWARE_COMPILE_TRUE = @UNIX_UNIXWARE_COMPILE_TRUE@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_MIDAS_SOUND_FALSE = @USE_MIDAS_SOUND_FALSE@ -USE_MIDAS_SOUND_TRUE = @USE_MIDAS_SOUND_TRUE@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -VERSION_RC = @VERSION_RC@ -VICEDIR = @VICEDIR@ -VICE_LIBPNG = @VICE_LIBPNG@ -VICE_LIBPNG_DEP = @VICE_LIBPNG_DEP@ -VICE_LIBPNG_DIR = @VICE_LIBPNG_DIR@ -VICE_LIBPNG_INCLUDES = @VICE_LIBPNG_INCLUDES@ -VICE_SYNC = @VICE_SYNC@ -VICE_VERSION = @VICE_VERSION@ -VICE_VERSION_BUILD = @VICE_VERSION_BUILD@ -VICE_VERSION_MAJOR = @VICE_VERSION_MAJOR@ -VICE_VERSION_MINOR = @VICE_VERSION_MINOR@ -VICE_ZLIB = @VICE_ZLIB@ -VICE_ZLIB_DEP = @VICE_ZLIB_DEP@ -VICE_ZLIB_DIR = @VICE_ZLIB_DIR@ -VICE_ZLIB_INCLUDES = @VICE_ZLIB_INCLUDES@ -WIN32_COMPILE_FALSE = @WIN32_COMPILE_FALSE@ -WIN32_COMPILE_TRUE = @WIN32_COMPILE_TRUE@ -WINDRES = @WINDRES@ -WRC = @WRC@ -X128_WINRES = @X128_WINRES@ -X64_WINRES = @X64_WINRES@ -XCBM2_WINRES = @XCBM2_WINRES@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XPET_WINRES = @XPET_WINRES@ -XPLUS4_WINRES = @XPLUS4_WINRES@ -XVIC_WINRES = @XVIC_WINRES@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@ -am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -artsc_config = @artsc_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -cxx = @cxx@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sdl_config = @sdl_config@ -sharedstatedir = @sharedstatedir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -x128_LDFLAGS = @x128_LDFLAGS@ -x64_LDFLAGS = @x64_LDFLAGS@ -xcbm2_LDFLAGS = @xcbm2_LDFLAGS@ -xpet_LDFLAGS = @xpet_LDFLAGS@ -xplus4_LDFLAGS = @xplus4_LDFLAGS@ -xvic_LDFLAGS = @xvic_LDFLAGS@ -SUBDIRS = $(POSUB) src build data man doc -EXTRA_DIST = AUTHORS FEEDBACK COPYING INSTALL NEWS vice.spec -all: all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/po $(distdir)/src - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-recursive ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ - dist-tarZ dist-zip distcheck distclean distclean-generic \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am - - -.PHONY: x64 x128 xvic xpet xplus4 xcbm2 -x64: - (cd src; $(MAKE) x64-all) - -x128: - (cd src; $(MAKE) x128-all) - -xvic: - (cd src; $(MAKE) xvic-all) - -xpet: - (cd src; $(MAKE) xpet-all) - -xplus4: - (cd src; $(MAKE) xplus4-all) - -xcbm2: - (cd src; $(MAKE) xcbm2-all) - -install: installvice - -@AMIGA_COMPILE_TRUE@bindist: -@AMIGA_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) nozip $(top_srcdir) $(EXEEXT) - -@AMIGA_COMPILE_TRUE@bindistzip: -@AMIGA_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) zip $(top_srcdir) $(EXEEXT) - -@BEOS_COMPILE_TRUE@bindist: -@BEOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) nozip $(top_srcdir) - -@BEOS_COMPILE_TRUE@bindistzip: -@BEOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) zip $(top_srcdir) - -@MSDOS_COMPILE_TRUE@bindist: -@MSDOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) nozip $(top_srcdir) - -@MSDOS_COMPILE_TRUE@bindistzip: -@MSDOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) zip $(top_srcdir) - -@UNIX_GP2X_COMPILE_TRUE@bindist: -@UNIX_GP2X_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/gp2x/make-bindist.sh $(STRIP) $(VICE_VERSION) nozip $(top_srcdir) - -@UNIX_GP2X_COMPILE_TRUE@bindistzip: -@UNIX_GP2X_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/gp2x/make-bindist.sh $(STRIP) $(VICE_VERSION) zip $(top_srcdir) - -@UNIX_MACOSX_COMPILE_TRUE@bindist: -@UNIX_MACOSX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) nozip @UNIX_MACOSX_UITYPE@ - -@UNIX_MACOSX_COMPILE_TRUE@bindistzip: -@UNIX_MACOSX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) zip @UNIX_MACOSX_UITYPE@ - -@UNIX_SKYOS_COMPILE_TRUE@bindist: -@UNIX_SKYOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) nozip $(top_srcdir) - -@UNIX_SKYOS_COMPILE_TRUE@bindistzip: -@UNIX_SKYOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) zip $(top_srcdir) - -@UNIX_QNX6_COMPILE_TRUE@bindist: -@UNIX_QNX6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip $(top_srcdir) - -@UNIX_QNX6_COMPILE_TRUE@bindistzip: -@UNIX_QNX6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip $(top_srcdir) - -@UNIX_QNX4_COMPILE_TRUE@bindist: -@UNIX_QNX4_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx4/make-bindist.sh $(VICE_VERSION) $(prefix) nozip $(top_srcdir) - -@UNIX_QNX4_COMPILE_TRUE@bindistzip: -@UNIX_QNX4_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx4/make-bindist.sh $(VICE_VERSION) $(prefix) zip $(top_srcdir) - -@UNIX_HPUX_COMPILE_TRUE@bindist: -@UNIX_HPUX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/hpux/make-bindist.sh $(STRIP) $(PERL) $(VICE_VERSION) $(prefix) $(host_cpu) $(host_os) nozip $(top_srcdir) - -@UNIX_HPUX_COMPILE_TRUE@bindistzip: -@UNIX_HPUX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/hpux/make-bindist.sh $(STRIP) $(PERL) $(VICE_VERSION) $(prefix) $(host_cpu) $(host_os) zip $(top_srcdir) - -@UNIX_SOLARIS_COMPILE_TRUE@bindist: -@UNIX_SOLARIS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sol $(infodir) $(mandir) $(top_srcdir) - -@UNIX_SOLARIS_COMPILE_TRUE@bindistzip: -@UNIX_SOLARIS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sol $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER5_COMPILE_TRUE@bindist: -@UNIX_OPENSERVER5_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco5 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER5_COMPILE_TRUE@bindistzip: -@UNIX_OPENSERVER5_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco5 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER6_COMPILE_TRUE@bindist: -@UNIX_OPENSERVER6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco6 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER6_COMPILE_TRUE@bindistzip: -@UNIX_OPENSERVER6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco6 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_UNIXWARE_COMPILE_TRUE@bindist: -@UNIX_UNIXWARE_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco7 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_UNIXWARE_COMPILE_TRUE@bindistzip: -@UNIX_UNIXWARE_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco7 $(infodir) $(mandir) $(top_srcdir) - -@WIN32_COMPILE_TRUE@bindist: -@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) nozip $(top_srcdir) - -@WIN32_COMPILE_TRUE@bindistzip: -@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) zip $(top_srcdir) - -@RISCOS_COMPILE_TRUE@bindist: -@RISCOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) nozip $(top_srcdir) - -@RISCOS_COMPILE_TRUE@bindistzip: -@RISCOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) zip $(top_srcdir) - -@MAKE_BINDIST_TRUE@installvice: -@MAKE_BINDIST_TRUE@ echo this platform doesn\'t use \"make install\", use \"make bindist\" instead - -@MAKE_BINDIST_FALSE@installvice: install-recursive - -cleantrans: - rm `find $(top_srcdir) -name "*.po.c"` -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Copied: trunk/vice/autogen.sh (from rev 18779, branches/spiro/vice-1.22.14-autogen.sh/vice/autogen.sh) =================================================================== --- trunk/vice/autogen.sh (rev 0) +++ trunk/vice/autogen.sh 2008-05-18 13:11:06 UTC (rev 18783) @@ -0,0 +1,104 @@ +#! /bin/sh + +# +# autogen.sh - generate the auto* files of VICE +# +# Written by +# Spiro Trikaliotis <spi...@gm...> +# +# This file is part of VICE, the Versatile Commodore Emulator. +# See README for copyright notice. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. +# + +do_command() { + # $1 - command + # $2 - options + + echo `pwd`: $1 $2 + $1 $2 > .$1.out 2>&1 + ret=$? + if [ ! $ret = 0 ] ; then + echo "ERROR: $1 failed in `pwd`" + exit 1 + fi +} + +do_aclocal() { + do_command aclocal +} + +do_autoconf() { + do_command autoconf -f +} + +do_autoheader() { + if [ ! x"`sed -ne "s/.*AM_CONFIG_HEADER\((.*)\).*/\1/p" configure.in`" = x ]; then + do_command autoheader + fi +} + +do_automake() { + do_command automake "-a -c" # " -f" +} + +buildfiles() { + FILES_TO_REMEMBER="INSTALL" + + # Save some files which should not be overwritten + + for A in $FILES_TO_REMEMBER; do + [ -e $A ] && mv $A $A.backup + done + + do_aclocal + + do_autoconf + do_autoheader + do_automake + + # Restore the files which should not be overwritten + + for A in $FILES_TO_REMEMBER; do + [ -e $A ] && mv $A.backup $A + done +} + +SUBDIRECTORIES=`sed -ne "s/.*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/p" configure.in` + +for A in $SUBDIRECTORIES; do + ( + cd $A + buildfiles + ) +done + +buildfiles + +if [ x"$1" == x"--dist" ]; then + + ./configure + (cd src/monitor/; make mon_lex.c mon_parse.c) + + (cd po; make cat-id-tbl.c) + + SVN_ADD_FILES="configure src/config.h.in config.guess config.sub src/monitor/mon_parse.c src/monitor/mon_parse.h src/monitor/mon_lex.c src/resid/depcomp src/resid/mkinstalldirs src/resid/missing src/resid/install-sh doc/texinfo.tex po/cat-id-tbl.c" + SVN_ADD_MAKEFILES="`find . -name Makefile.in`" + + svn add $SVN_ADD_FILES $SVN_ADD_MAKEFILES + +fi Deleted: trunk/vice/build/Makefile.in =================================================================== --- trunk/vice/build/Makefile.in 2008-05-18 12:22:18 UTC (rev 18782) +++ trunk/vice/build/Makefile.in 2008-05-18 13:11:06 UTC (rev 18783) @@ -1,487 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = build -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALTERNATE_DOCDIR_FALSE = @ALTERNATE_DOCDIR_FALSE@ -ALTERNATE_DOCDIR_TRUE = @ALTERNATE_DOCDIR_TRUE@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMIGA_COMPILE_FALSE = @AMIGA_COMPILE_FALSE@ -AMIGA_COMPILE_TRUE = @AMIGA_COMPILE_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -ARCH_DIR = @ARCH_DIR@ -ARCH_EXTRA_SUBDIR = @ARCH_EXTRA_SUBDIR@ -ARCH_INCLUDES = @ARCH_INCLUDES@ -ARCH_LIBS = @ARCH_LIBS@ -ARCH_SRC_DIR = @ARCH_SRC_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BEOS_COMPILE_FALSE = @BEOS_COMPILE_FALSE@ -BEOS_COMPILE_TRUE = @BEOS_COMPILE_TRUE@ -BINDIR = @BINDIR@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CROSS = @CROSS@ -CROSS_FALSE = @CROSS_FALSE@ -CROSS_TRUE = @CROSS_TRUE@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DOS_TFE_PCAP_LIB = @DOS_TFE_PCAP_LIB@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FCCACHE = @FCCACHE@ -FFMPEG_INCLUDES = @FFMPEG_INCLUDES@ -FFMPEG_LIBS = @FFMPEG_LIBS@ -FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@ -GENCAT = @GENCAT@ -GFXOUTPUT_DRIVERS = @GFXOUTPUT_DRIVERS@ -GFXOUTPUT_LIBS = @GFXOUTPUT_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_FALSE = @GNOMEUI_FALSE@ -GNOMEUI_TRUE = @GNOMEUI_TRUE@ -GREP = @GREP@ -GTKGL_CFLAGS = @GTKGL_CFLAGS@ -GTKGL_LIBS = @GTKGL_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HAVE_FC_CACHE_FALSE = @HAVE_FC_CACHE_FALSE@ -HAVE_FC_CACHE_TRUE = @HAVE_FC_CACHE_TRUE@ -HAVE_RAWDRIVE_FALSE = @HAVE_RAWDRIVE_FALSE@ -HAVE_RAWDRIVE_TRUE = @HAVE_RAWDRIVE_TRUE@ -HAVE_READLINE = @HAVE_READLINE@ -HAVE_REALDEVICE_FALSE = @HAVE_REALDEVICE_FALSE@ -HAVE_REALDEVICE_TRUE = @HAVE_REALDEVICE_TRUE@ -HAVE_RESID_FALSE = @HAVE_RESID_FALSE@ -HAVE_RESID_TRUE = @HAVE_RESID_TRUE@ -HAVE_RS232_FALSE = @HAVE_RS232_FALSE@ -HAVE_RS232_TRUE = @HAVE_RS232_TRUE@ -HAVE_TRANSLATION_FALSE = @HAVE_TRANSLATION_FALSE@ -HAVE_TRANSLATION_TRUE = @HAVE_TRANSLATION_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -JOY_LIBS = @JOY_LIBS@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LINKCC = @LINKCC@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MACOSX_COCOA_FALSE = @MACOSX_COCOA_FALSE@ -MACOSX_COCOA_TRUE = @MACOSX_COCOA_TRUE@ -MAKEINFO = @MAKEINFO@ -MAKE_BINDIST_FALSE = @MAKE_BINDIST_FALSE@ -MAKE_BINDIST_TRUE = @MAKE_BINDIST_TRUE@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSDOS_COMPILE_FALSE = @MSDOS_COMPILE_FALSE@ -MSDOS_COMPILE_TRUE = @MSDOS_COMPILE_TRUE@ -MSGFMT = @MSGFMT@ -NEED_READLINE_FALSE = @NEED_READLINE_FALSE@ -NEED_READLINE_TRUE = @NEED_READLINE_TRUE@ -NETPLAY_LIBS = @NETPLAY_LIBS@ -NLS_LOCALEDIR = @NLS_LOCALEDIR@ -OBJC = @OBJC@ -OBJCDEPMODE = @OBJCDEPMODE@ -OBJCFLAGS = @OBJCFLAGS@ -OBJEXT = @OBJEXT@ -OS2_COMPILE_FALSE = @OS2_COMPILE_FALSE@ -OS2_COMPILE_TRUE = @OS2_COMPILE_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PKG_CONFIG = @PKG_CONFIG@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -READLINE = @READLINE@ -READLINE_LIBS = @READLINE_LIBS@ -RESID_DEP = @RESID_DEP@ -RESID_DIR = @RESID_DIR@ -RESID_INCLUDES = @RESID_INCLUDES@ -RESID_LIBS = @RESID_LIBS@ -RISCOS_COMPILE_FALSE = @RISCOS_COMPILE_FALSE@ -RISCOS_COMPILE_TRUE = @RISCOS_COMPILE_TRUE@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SOUND_AIX_OBJ = @SOUND_AIX_OBJ@ -SOUND_DRIVERS = @SOUND_DRIVERS@ -SOUND_HPUX_OBJ = @SOUND_HPUX_OBJ@ -SOUND_LIBS = @SOUND_LIBS@ -SOUND_MIDAS_OBJ = @SOUND_MIDAS_OBJ@ -SOUND_SDL_OBJ = @SOUND_SDL_OBJ@ -SOUND_SGI_OBJ = @SOUND_SGI_OBJ@ -SOUND_USS_OBJ = @SOUND_USS_OBJ@ -STRIP = @STRIP@ -TFE_LIBS = @TFE_LIBS@ -UI_LIBS = @UI_LIBS@ -UNIX_COMPILE_FALSE = @UNIX_COMPILE_FALSE@ -UNIX_COMPILE_TRUE = @UNIX_COMPILE_TRUE@ -UNIX_GP2X_COMPILE_FALSE = @UNIX_GP2X_COMPILE_FALSE@ -UNIX_GP2X_COMPILE_TRUE = @UNIX_GP2X_COMPILE_TRUE@ -UNIX_HPUX_COMPILE_FALSE = @UNIX_HPUX_COMPILE_FALSE@ -UNIX_HPUX_COMPILE_TRUE = @UNIX_HPUX_COMPILE_TRUE@ -UNIX_MACOSX_COMPILE_FALSE = @UNIX_MACOSX_COMPILE_FALSE@ -UNIX_MACOSX_COMPILE_TRUE = @UNIX_MACOSX_COMPILE_TRUE@ -UNIX_MACOSX_UITYPE = @UNIX_MACOSX_UITYPE@ -UNIX_OPENSERVER5_COMPILE_FALSE = @UNIX_OPENSERVER5_COMPILE_FALSE@ -UNIX_OPENSERVER5_COMPILE_TRUE = @UNIX_OPENSERVER5_COMPILE_TRUE@ -UNIX_OPENSERVER6_COMPILE_FALSE = @UNIX_OPENSERVER6_COMPILE_FALSE@ -UNIX_OPENSERVER6_COMPILE_TRUE = @UNIX_OPENSERVER6_COMPILE_TRUE@ -UNIX_QNX4_COMPILE_FALSE = @UNIX_QNX4_COMPILE_FALSE@ -UNIX_QNX4_COMPILE_TRUE = @UNIX_QNX4_COMPILE_TRUE@ -UNIX_QNX6_COMPILE_FALSE = @UNIX_QNX6_COMPILE_FALSE@ -UNIX_QNX6_COMPILE_TRUE = @UNIX_QNX6_COMPILE_TRUE@ -UNIX_SKYOS_COMPILE_FALSE = @UNIX_SKYOS_COMPILE_FALSE@ -UNIX_SKYOS_COMPILE_TRUE = @UNIX_SKYOS_COMPILE_TRUE@ -UNIX_SOLARIS_COMPILE_FALSE = @UNIX_SOLARIS_COMPILE_FALSE@ -UNIX_SOLARIS_COMPILE_TRUE = @UNIX_SOLARIS_COMPILE_TRUE@ -UNIX_UNIXWARE_COMPILE_FALSE = @UNIX_UNIXWARE_COMPILE_FALSE@ -UNIX_UNIXWARE_COMPILE_TRUE = @UNIX_UNIXWARE_COMPILE_TRUE@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_MIDAS_SOUND_FALSE = @USE_MIDAS_SOUND_FALSE@ -USE_MIDAS_SOUND_TRUE = @USE_MIDAS_SOUND_TRUE@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -VERSION_RC = @VERSION_RC@ -VICEDIR = @VICEDIR@ -VICE_LIBPNG = @VICE_LIBPNG@ -VICE_LIBPNG_DEP = @VICE_LIBPNG_DEP@ -VICE_LIBPNG_DIR = @VICE_LIBPNG_DIR@ -VICE_LIBPNG_INCLUDES = @VICE_LIBPNG_INCLUDES@ -VICE_SYNC = @VICE_SYNC@ -VICE_VERSION = @VICE_VERSION@ -VICE_VERSION_BUILD = @VICE_VERSION_BUILD@ -VICE_VERSION_MAJOR = @VICE_VERSION_MAJOR@ -VICE_VERSION_MINOR = @VICE_VERSION_MINOR@ -VICE_ZLIB = @VICE_ZLIB@ -VICE_ZLIB_DEP = @VICE_ZLIB_DEP@ -VICE_ZLIB_DIR = @VICE_ZLIB_DIR@ -VICE_ZLIB_INCLUDES = @VICE_ZLIB_INCLUDES@ -WIN32_COMPILE_FALSE = @WIN32_COMPILE_FALSE@ -WIN32_COMPILE_TRUE = @WIN32_COMPILE_TRUE@ -WINDRES = @WINDRES@ -WRC = @WRC@ -X128_WINRES = @X128_WINRES@ -X64_WINRES = @X64_WINRES@ -XCBM2_WINRES = @XCBM2_WINRES@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XPET_WINRES = @XPET_WINRES@ -XPLUS4_WINRES = @XPLUS4_WINRES@ -XVIC_WINRES = @XVIC_WINRES@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@ -am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -artsc_config = @artsc_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -cxx = @cxx@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sdl_config = @sdl_config@ -sharedstatedir = @sharedstatedir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -x128_LDFLAGS = @x128_LDFLAGS@ -x64_LDFLAGS = @x64_LDFLAGS@ -xcbm2_LDFLAGS = @xcbm2_LDFLAGS@ -xpet_LDFLAGS = @xpet_LDFLAGS@ -xplus4_LDFLAGS = @xplus4_LDFLAGS@ -xvic_LDFLAGS = @xvic_LDFLAGS@ -EXTRA_DIST = \ - amigaos/build-os4-native.sh \ - amigaos/build-vbcc.sh \ - beos/ppc-build.sh \ - mingw32/build-cross.sh \ - macosx/build-allext.sh \ - macosx/build-gtk.sh \ - macosx/build-hidutils.sh \ - macosx/build-inc.sh \ - macosx/build-pcaplibnet.sh \ - macosx/build-readline.sh \ - macosx/build-vice-dist.sh \ - macosx/build-ffmpeglame.sh \ - minix3/build.sh \ - minix3/build-package.sh \ - qnx4/build.sh \ - riscos/build-cross.sh \ - vms/build.sh - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu build/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/amigaos $(distdir)/beos $(distdir)/macosx $(distdir)/mingw32 $(distdir)/minix3 $(distdir)/qnx4 $(distdir)/riscos $(distdir)/vms - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Deleted: trunk/vice/configure =================================================================== --- trunk/vice/configure 2008-05-18 12:22:18 UTC (rev 18782) +++ trunk/vice/configure 2008-05-18 13:11:06 UTC (rev 18783) @@ -1,31403 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61. -# -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH - - -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -... [truncated message content] |
From: <st...@us...> - 2008-05-18 12:22:19
|
Revision: 18782 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18782&view=rev Author: strik Date: 2008-05-18 05:22:18 -0700 (Sun, 18 May 2008) Log Message: ----------- 2008-05-18 Spiro Trikaliotis <spi...@gm...> * arch/unix/x11/gnome/uifileentry.c: #include <gtk/gtkfilechooserwidget.h> for missing prototypes. This fixed debian bug #449427 (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=449427) Modified Paths: -------------- trunk/vice/src/ChangeLog trunk/vice/src/arch/unix/x11/gnome/uifileentry.c Modified: trunk/vice/src/ChangeLog =================================================================== --- trunk/vice/src/ChangeLog 2008-05-18 12:21:26 UTC (rev 18781) +++ trunk/vice/src/ChangeLog 2008-05-18 12:22:18 UTC (rev 18782) @@ -1,5 +1,10 @@ 2008-05-18 Spiro Trikaliotis <spi...@gm...> + * arch/unix/x11/gnome/uifileentry.c: #include + <gtk/gtkfilechooserwidget.h> for missing prototypes. This fixed + debian bug #449427 + (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=449427) + * arch/unix/x11/ui-resources.c: Use firefox instead of netscape as default browser. This partially fixes debian bug #480714. (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=480714) Modified: trunk/vice/src/arch/unix/x11/gnome/uifileentry.c =================================================================== --- trunk/vice/src/arch/unix/x11/gnome/uifileentry.c 2008-05-18 12:21:26 UTC (rev 18781) +++ trunk/vice/src/arch/unix/x11/gnome/uifileentry.c 2008-05-18 12:22:18 UTC (rev 18782) @@ -28,6 +28,7 @@ #include <stdio.h> #include <gtk/gtkfilechooser.h> +#include <gtk/gtkfilechooserwidget.h> #include "uifileentry.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-05-18 12:21:25
|
Revision: 18781 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18781&view=rev Author: strik Date: 2008-05-18 05:21:26 -0700 (Sun, 18 May 2008) Log Message: ----------- 2008-05-18 Spiro Trikaliotis <spi...@gm...> * arch/unix/x11/ui-resources.c: Use firefox instead of netscape as default browser. This partially fixes debian bug #480714. (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=480714) Modified Paths: -------------- trunk/vice/src/ChangeLog trunk/vice/src/arch/unix/x11/ui-resources.c Modified: trunk/vice/src/ChangeLog =================================================================== --- trunk/vice/src/ChangeLog 2008-05-18 08:54:58 UTC (rev 18780) +++ trunk/vice/src/ChangeLog 2008-05-18 12:21:26 UTC (rev 18781) @@ -1,3 +1,9 @@ +2008-05-18 Spiro Trikaliotis <spi...@gm...> + + * arch/unix/x11/ui-resources.c: Use firefox instead of netscape + as default browser. This partially fixes debian bug #480714. + (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=480714) + 2008-05-07 Spiro Trikaliotis <spi...@gm...> * Version 1.22.14. Modified: trunk/vice/src/arch/unix/x11/ui-resources.c =================================================================== --- trunk/vice/src/arch/unix/x11/ui-resources.c 2008-05-18 08:54:58 UTC (rev 18780) +++ trunk/vice/src/arch/unix/x11/ui-resources.c 2008-05-18 12:21:26 UTC (rev 18781) @@ -112,7 +112,7 @@ #ifdef MACOSX_SUPPORT "/usr/bin/open %s", #else - "netscape %s", + "firefox %s", #endif RES_EVENT_NO, NULL, &ui_resources.html_browser_command, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bla...@us...> - 2008-05-18 08:54:54
|
Revision: 18780 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18780&view=rev Author: blackystardust Date: 2008-05-18 01:54:58 -0700 (Sun, 18 May 2008) Log Message: ----------- Fixed the confirmexit and singlecpu command-line options bug for the win32 and amiga ports. Modified Paths: -------------- branches/marco/ports/vice/src/arch/amigaos/uiapi.c branches/marco/ports/vice/src/arch/win32/ui-resources.c Modified: branches/marco/ports/vice/src/arch/amigaos/uiapi.c =================================================================== --- branches/marco/ports/vice/src/arch/amigaos/uiapi.c 2008-05-16 19:11:48 UTC (rev 18779) +++ branches/marco/ports/vice/src/arch/amigaos/uiapi.c 2008-05-18 08:54:58 UTC (rev 18780) @@ -220,10 +220,10 @@ "SaveResourcesOnExit", (resource_value_t)0, 0, IDS_NEVER_SAVE_SETTINGS_EXIT }, { "-confirmexit", SET_RESOURCE, 0, NULL, NULL, - "ConfirmOnExit", (resource_value_t)0, + "ConfirmOnExit", (resource_value_t)1, 0, IDS_CONFIRM_QUITING_VICE }, { "+confirmexit", SET_RESOURCE, 0, NULL, NULL, - "ConfirmOnExit", (resource_value_t)1, + "ConfirmOnExit", (resource_value_t)0, 0, IDS_NEVER_CONFIRM_QUITING_VICE }, { NULL } }; Modified: branches/marco/ports/vice/src/arch/win32/ui-resources.c =================================================================== --- branches/marco/ports/vice/src/arch/win32/ui-resources.c 2008-05-16 19:11:48 UTC (rev 18779) +++ branches/marco/ports/vice/src/arch/win32/ui-resources.c 2008-05-18 08:54:58 UTC (rev 18780) @@ -271,16 +271,16 @@ "SaveResourcesOnExit", (resource_value_t)0, 0, IDS_NO_SAVE_SETTINGS_ON_EXIT }, { "-confirmexit", SET_RESOURCE, 0, NULL, NULL, - "ConfirmOnExit", (resource_value_t)0, + "ConfirmOnExit", (resource_value_t)1, 0, IDS_CONFIRM_QUIT_VICE }, { "+confirmexit", SET_RESOURCE, 0, NULL, NULL, - "ConfirmOnExit", (resource_value_t)1, + "ConfirmOnExit", (resource_value_t)0, 0, IDS_NO_CONFIRM_QUIT_VICE }, { "-singlecpu", SET_RESOURCE, 0, NULL, NULL, - "SingleCPU", (resource_value_t)0, + "SingleCPU", (resource_value_t)1, 0, IDS_USE_ALL_CPU_SMP }, { "+singlecpu", SET_RESOURCE, 0, NULL, NULL, - "SingleCPU", (resource_value_t)1, + "SingleCPU", (resource_value_t)0, 0, IDS_USE_FIRST_CPU_SMP }, { NULL } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bla...@us...> - 2008-05-16 19:12:46
|
Revision: 18779 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18779&view=rev Author: blackystardust Date: 2008-05-16 12:11:48 -0700 (Fri, 16 May 2008) Log Message: ----------- Fixed some 'out of the box' compile problems Modified Paths: -------------- branches/spiro/vice-1.22.14-autogen.sh/vice/doc/Makefile.am branches/spiro/vice-1.22.14-autogen.sh/vice/doc/html/Makefile.am branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/os2/vac++/config.h branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/os2/watcom/config.h branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/win32/watcom/config.h branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/win32/watcom/maincpu.tgt branches/spiro/vice-1.22.14-autogen.sh/vice/src/ioutil.c Modified: branches/spiro/vice-1.22.14-autogen.sh/vice/doc/Makefile.am =================================================================== --- branches/spiro/vice-1.22.14-autogen.sh/vice/doc/Makefile.am 2008-05-14 20:05:02 UTC (rev 18778) +++ branches/spiro/vice-1.22.14-autogen.sh/vice/doc/Makefile.am 2008-05-16 19:11:48 UTC (rev 18779) @@ -1,6 +1,8 @@ -@ALTERNATE_DOCDIR_TRUE@docdir = $(prefix)/share/doc/vice -@ALTERNATE_DOCDIR_FALSE@docdir = $(VICEDIR)/doc +@ALTERNATE_DOCDIR_TRUE@realdocdir = $(prefix)/share/doc/vice +@ALTERNATE_DOCDIR_FALSE@realdocdir = $(VICEDIR)/doc +docdir = $(realdocdir) + doc_DATA = \ Minix-Howto.txt \ MSDOS-Ethernet-Howto.txt \ Modified: branches/spiro/vice-1.22.14-autogen.sh/vice/doc/html/Makefile.am =================================================================== --- branches/spiro/vice-1.22.14-autogen.sh/vice/doc/html/Makefile.am 2008-05-14 20:05:02 UTC (rev 18778) +++ branches/spiro/vice-1.22.14-autogen.sh/vice/doc/html/Makefile.am 2008-05-16 19:11:48 UTC (rev 18779) @@ -1,6 +1,8 @@ -@ALTERNATE_DOCDIR_TRUE@docdir = $(prefix)/share/doc/vice -@ALTERNATE_DOCDIR_FALSE@docdir = $(VICEDIR)/doc +@ALTERNATE_DOCDIR_TRUE@realdocdir = $(prefix)/share/doc/vice +@ALTERNATE_DOCDIR_FALSE@realdocdir = $(VICEDIR)/doc +docdir = $(realdocdir) + doc_DATA = \ amigaos.html \ beos.html \ Modified: branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/os2/vac++/config.h =================================================================== --- branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/os2/vac++/config.h 2008-05-14 20:05:02 UTC (rev 18778) +++ branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/os2/vac++/config.h 2008-05-16 19:11:48 UTC (rev 18779) @@ -148,6 +148,7 @@ #define HAVE_LIMITS_H 1 /* Define if you have the <limits.h> header file. */ #define HAVE_REGEXP_H 1 /* Define if you have the <regexp.h> header file. */ #define HAVE_SYS_TIME_H 1 /* Define if you have the <sys/time.h> header file. */ +#define HAVE_GETCWD 1 /* #undef HAVE_USLEEP *//* Define if you have the usleep function. */ /* #undef HAVE_REGEX_H *//* Define if you have the <regex.h> header file. */ Modified: branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/os2/watcom/config.h =================================================================== --- branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/os2/watcom/config.h 2008-05-14 20:05:02 UTC (rev 18778) +++ branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/os2/watcom/config.h 2008-05-16 19:11:48 UTC (rev 18779) @@ -152,6 +152,7 @@ #define HAVE_LIMITS_H 1 /* Define if you have the <limits.h> header file. */ #define HAVE_REGEXP_H 1 /* Define if you have the <regexp.h> header file. */ #define HAVE_SYS_TIME_H 1 /* Define if you have the <sys/time.h> header file. */ +#define HAVE_GETCWD 1 /* #undef HAVE_USLEEP *//* Define if you have the usleep function. */ /* #undef HAVE_REGEX_H *//* Define if you have the <regex.h> header file. */ Modified: branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/win32/watcom/config.h =================================================================== --- branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/win32/watcom/config.h 2008-05-14 20:05:02 UTC (rev 18778) +++ branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/win32/watcom/config.h 2008-05-16 19:11:48 UTC (rev 18779) @@ -42,6 +42,7 @@ #define HAVE_STRNCASECMP 1 #define HAVE_PROCESS_H 1 #define HAVE_GUIDLIB 1 +#define HAVE_GETCWD 1 #define __i386__ 1 Modified: branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/win32/watcom/maincpu.tgt =================================================================== --- branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/win32/watcom/maincpu.tgt 2008-05-14 20:05:02 UTC (rev 18778) +++ branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/win32/watcom/maincpu.tgt 2008-05-16 19:11:48 UTC (rev 18779) @@ -18,8 +18,8 @@ 1 4 MCommand -167 -genwinres ..\res.h ..\res.txt ..\resdialogs.txt ..\resmenu.txt ..\resstrings.txt +179 +genwinres ..\res.h ..\menuid.h ..\res.txt ..\resdialogs.txt ..\resmenu.txt ..\resstrings.txt gentranslate ..\..\..\translate.txt ..\..\..\translate.h ..\..\..\translate_table.h 5 Modified: branches/spiro/vice-1.22.14-autogen.sh/vice/src/ioutil.c =================================================================== --- branches/spiro/vice-1.22.14-autogen.sh/vice/src/ioutil.c 2008-05-14 20:05:02 UTC (rev 18778) +++ branches/spiro/vice-1.22.14-autogen.sh/vice/src/ioutil.c 2008-05-16 19:11:48 UTC (rev 18779) @@ -136,7 +136,7 @@ #endif #if !defined(VMS) && !defined(__VAX) -#ifndef HAVE_GETCWD +#if !defined(HAVE_GETCWD) && !defined(RISCOS) char *getcwd (char *buf, size_t len) { char ourbuf[PATH_MAX]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-05-14 20:05:08
|
Revision: 18778 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18778&view=rev Author: amatthies Date: 2008-05-14 13:05:02 -0700 (Wed, 14 May 2008) Log Message: ----------- Initial branch for my testfeature Added Paths: ----------- branches/amatthies/v1.22.14-mytestfeature/ Copied: branches/amatthies/v1.22.14-mytestfeature (from rev 18777, tags/v1.22/v1.22.14) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-05-14 19:29:03
|
Revision: 18777 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18777&view=rev Author: amatthies Date: 2008-05-14 12:28:46 -0700 (Wed, 14 May 2008) Log Message: ----------- Testbranch for my work Added Paths: ----------- branches/amatthies/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bla...@us...> - 2008-05-14 02:22:36
|
Revision: 18776 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18776&view=rev Author: blackystardust Date: 2008-05-13 19:22:42 -0700 (Tue, 13 May 2008) Log Message: ----------- Created a new branch in which I will do my arch/UI specific coding. Added Paths: ----------- branches/marco/ports/ Copied: branches/marco/ports (from rev 18775, tags/v1.22/v1.22.14) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-05-13 08:53:21
|
Revision: 18775 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18775&view=rev Author: strik Date: 2008-05-13 01:52:22 -0700 (Tue, 13 May 2008) Log Message: ----------- Re-added files which can be auto-generated, but which have been deliberately changed (config.guess, config.sub) to support more platforms, or which seldom change and where the absence would break compilations on some platforms (src/monitor/mon_parse.c, src/monitor/mon_parse.h, src/monitor/mon_lex.c) Added Paths: ----------- branches/spiro/vice-1.22.14-autogen.sh/vice/config.guess branches/spiro/vice-1.22.14-autogen.sh/vice/config.sub branches/spiro/vice-1.22.14-autogen.sh/vice/src/monitor/mon_lex.c branches/spiro/vice-1.22.14-autogen.sh/vice/src/monitor/mon_parse.c branches/spiro/vice-1.22.14-autogen.sh/vice/src/monitor/mon_parse.h Copied: branches/spiro/vice-1.22.14-autogen.sh/vice/config.guess (from rev 18773, branches/spiro/vice-1.22.14-autogen.sh/vice/config.guess) =================================================================== --- branches/spiro/vice-1.22.14-autogen.sh/vice/config.guess (rev 0) +++ branches/spiro/vice-1.22.14-autogen.sh/vice/config.guess 2008-05-13 08:52:22 UTC (rev 18775) @@ -0,0 +1,1473 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + +timestamp='2005-07-08' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Originally written by Per Bothner <pe...@bo...>. +# Please send patches to <con...@gn...>. Submit a context +# diff and a properly formatted ChangeLog entry. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# +# The plan is that this can be called by configure scripts if you +# don't specify an explicit build system type. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to <con...@gn...>." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (gh...@no... 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +case "${UNAME_MACHINE}" in + i?86) + test -z "$VENDOR" && VENDOR=pc + ;; + *) + test -z "$VENDOR" && VENDOR=unknown + ;; +esac +test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # ak...@wp... (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include <stdio.h> /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include <sys/systemcfg.h> + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[45]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include <stdlib.h> + #include <unistd.h> + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include <unistd.h> + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + i*:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + arm*:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux + exit ;; + cris:Linux:*:*) + echo cris-axis-linux + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux + exit ;; + frv:Linux:*:*) + echo frv-${VENDOR}-linux + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux + exit ;; + mips:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; } + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; } + ;; + ppc:Linux:*:*) + echo powerpc-${VENDOR}-linux + exit ;; + ppc64:Linux:*:*) + echo powerpc64-${VENDOR}-linux + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-${VENDOR}-linux ;; + PA8*) echo hppa2.0-${VENDOR}-linux ;; + *) echo hppa-${VENDOR}-linux ;; + esac + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-${VENDOR}-linux + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux + exit ;; + x86_64:Linux:*:*) + echo x86_64-${VENDOR}-linux + exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d + s/[ ][ ]*/ /g + s/.*supported targets: *// + s/ .*// + p'` + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux" + ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-${VENDOR}-linuxaout" + exit ;; + coff-i386) + echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff" + exit ;; + "") + # Either a pre-BFD a.out linker (linuxoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld" + exit ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include <features.h> + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #ifdef __INTEL_COMPILER + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sco3.2v${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` + echo ${UNAME_MACHINE}-pc-isc$UNAME_REL + elif /bin/uname -X 2>/dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says <Ric...@cc...> + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes <he...@op...>. + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From se...@sw.... + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Pau...@st.... + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Pau...@st.... + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + *86) UNAME_PROCESSOR=i686 ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; +esac + +#echo '(No uname command or uname output not recognized.)' 1>&2 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + +eval $set_cc_for_build +cat >$dummy.c <<EOF +#ifdef _SEQUENT_ +# include <sys/types.h> +# include <sys/utsname.h> +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include <sys/param.h> + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include <sys/param.h> +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + +cat >&2 <<EOF +$0: unable to guess system type + +This script, last modified $timestamp, has failed to recognize +the operating system you are using. It is advised that you +download the most up to date version of the config scripts from + + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess +and + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + +If the version you run ($0) is already up to date, please +send the following data and any information you think might be +pertinent to <con...@gn...> in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: Copied: branches/spiro/vice-1.22.14-autogen.sh/vice/config.sub (from rev 18773, branches/spiro/vice-1.22.14-autogen.sh/vice/config.sub) =================================================================== --- branches/spiro/vice-1.22.14-autogen.sh/vice/config.sub (rev 0) +++ branches/spiro/vice-1.22.14-autogen.sh/vice/config.sub 2008-05-13 08:52:22 UTC (rev 18775) @@ -0,0 +1,1584 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + +timestamp='2005-07-08' + +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software +# can handle that machine. It does not imply ALL GNU software can. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Please send patches to <con...@gn...>. Submit a context +# diff and a properly formatted ChangeLog entry. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to <con...@gn...>." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray) + os= + basic_machine=$1 + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | ms1 \ + | msp430 \ + | ns16k | ns32k \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b \ + | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k) + basic_machine=$basic_machine-unknown + ;; + m32c) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | ms1-* \ + | msp430-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ + | ymp-* \ + | z8k-*) + ;; + m32c-*) + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-moto... [truncated message content] |
From: <st...@us...> - 2008-05-12 13:33:27
|
Revision: 18774 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18774&view=rev Author: strik Date: 2008-05-12 06:33:18 -0700 (Mon, 12 May 2008) Log Message: ----------- Some auto-generated files are removed from the SVN now. There is a new autogen.sh file which generates them, if needed. This tool also adds these files back to SVN if it is run with the --dist option. Modified Paths: -------------- branches/spiro/vice-1.22.14-autogen.sh/vice/src/monitor/Makefile.am Added Paths: ----------- branches/spiro/vice-1.22.14-autogen.sh/vice/autogen.sh Removed Paths: ------------- branches/spiro/vice-1.22.14-autogen.sh/vice/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/build/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/config.guess branches/spiro/vice-1.22.14-autogen.sh/vice/config.sub branches/spiro/vice-1.22.14-autogen.sh/vice/configure branches/spiro/vice-1.22.14-autogen.sh/vice/data/C128/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/data/C64/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/data/CBM-II/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/data/DRIVES/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/data/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/data/PET/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/data/PLUS4/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/data/PRINTER/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/data/VIC20/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/data/fonts/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/doc/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/doc/html/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/doc/texinfo.tex branches/spiro/vice-1.22.14-autogen.sh/vice/man/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/po/cat-id-tbl.c branches/spiro/vice-1.22.14-autogen.sh/vice/src/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/amigaos/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/beos/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/msdos/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/os2/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/os2/dialogs/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/os2/kbd/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/os2/snippets/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/os2/vac++/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/riscos/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/unix/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/unix/gp2x/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/unix/gui/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/unix/macosx/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/unix/macosx/Resources/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/unix/macosx/cocoa/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/unix/macosx/cocoa/menu/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/unix/macosx/cocoa/view/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/unix/readline/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/unix/x11/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/unix/x11/gnome/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/unix/x11/xaw/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/unix/x11/xaw/widgets/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/win32/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/arch/win32/utils/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/c128/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/c64/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/c64/cart/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/cbm2/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/config.h.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/core/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/crtc/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/diskimage/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/drive/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/drive/iec/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/drive/iec/c64exp/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/drive/iec/plus4exp/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/drive/iec128dcr/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/drive/iecieee/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/drive/ieee/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/drive/tcbm/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/fileio/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/fsdevice/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/gfxoutputdrv/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/iecbus/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/imagecontents/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/lib/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/lib/lpng/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/lib/zlib/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/monitor/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/monitor/mon_lex.c branches/spiro/vice-1.22.14-autogen.sh/vice/src/monitor/mon_parse.c branches/spiro/vice-1.22.14-autogen.sh/vice/src/monitor/mon_parse.h branches/spiro/vice-1.22.14-autogen.sh/vice/src/parallel/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/pet/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/plus4/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/printerdrv/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/raster/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/resid/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/rs232drv/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/serial/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/sid/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/sounddrv/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/tape/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/vdc/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/vdrive/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/vic20/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/vicii/Makefile.in branches/spiro/vice-1.22.14-autogen.sh/vice/src/video/Makefile.in Deleted: branches/spiro/vice-1.22.14-autogen.sh/vice/Makefile.in =================================================================== --- branches/spiro/vice-1.22.14-autogen.sh/vice/Makefile.in 2008-05-12 10:10:35 UTC (rev 18773) +++ branches/spiro/vice-1.22.14-autogen.sh/vice/Makefile.in 2008-05-12 13:33:18 UTC (rev 18774) @@ -1,869 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# Process this file with automake to produce Makefile.in -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS config.guess config.sub depcomp \ - install-sh missing mkinstalldirs -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -ALTERNATE_DOCDIR_FALSE = @ALTERNATE_DOCDIR_FALSE@ -ALTERNATE_DOCDIR_TRUE = @ALTERNATE_DOCDIR_TRUE@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMIGA_COMPILE_FALSE = @AMIGA_COMPILE_FALSE@ -AMIGA_COMPILE_TRUE = @AMIGA_COMPILE_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -ARCH_DIR = @ARCH_DIR@ -ARCH_EXTRA_SUBDIR = @ARCH_EXTRA_SUBDIR@ -ARCH_INCLUDES = @ARCH_INCLUDES@ -ARCH_LIBS = @ARCH_LIBS@ -ARCH_SRC_DIR = @ARCH_SRC_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BEOS_COMPILE_FALSE = @BEOS_COMPILE_FALSE@ -BEOS_COMPILE_TRUE = @BEOS_COMPILE_TRUE@ -BINDIR = @BINDIR@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CROSS = @CROSS@ -CROSS_FALSE = @CROSS_FALSE@ -CROSS_TRUE = @CROSS_TRUE@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DOS_TFE_PCAP_LIB = @DOS_TFE_PCAP_LIB@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FCCACHE = @FCCACHE@ -FFMPEG_INCLUDES = @FFMPEG_INCLUDES@ -FFMPEG_LIBS = @FFMPEG_LIBS@ -FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@ -GENCAT = @GENCAT@ -GFXOUTPUT_DRIVERS = @GFXOUTPUT_DRIVERS@ -GFXOUTPUT_LIBS = @GFXOUTPUT_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_FALSE = @GNOMEUI_FALSE@ -GNOMEUI_TRUE = @GNOMEUI_TRUE@ -GREP = @GREP@ -GTKGL_CFLAGS = @GTKGL_CFLAGS@ -GTKGL_LIBS = @GTKGL_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HAVE_FC_CACHE_FALSE = @HAVE_FC_CACHE_FALSE@ -HAVE_FC_CACHE_TRUE = @HAVE_FC_CACHE_TRUE@ -HAVE_RAWDRIVE_FALSE = @HAVE_RAWDRIVE_FALSE@ -HAVE_RAWDRIVE_TRUE = @HAVE_RAWDRIVE_TRUE@ -HAVE_READLINE = @HAVE_READLINE@ -HAVE_REALDEVICE_FALSE = @HAVE_REALDEVICE_FALSE@ -HAVE_REALDEVICE_TRUE = @HAVE_REALDEVICE_TRUE@ -HAVE_RESID_FALSE = @HAVE_RESID_FALSE@ -HAVE_RESID_TRUE = @HAVE_RESID_TRUE@ -HAVE_RS232_FALSE = @HAVE_RS232_FALSE@ -HAVE_RS232_TRUE = @HAVE_RS232_TRUE@ -HAVE_TRANSLATION_FALSE = @HAVE_TRANSLATION_FALSE@ -HAVE_TRANSLATION_TRUE = @HAVE_TRANSLATION_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -JOY_LIBS = @JOY_LIBS@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LINKCC = @LINKCC@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MACOSX_COCOA_FALSE = @MACOSX_COCOA_FALSE@ -MACOSX_COCOA_TRUE = @MACOSX_COCOA_TRUE@ -MAKEINFO = @MAKEINFO@ -MAKE_BINDIST_FALSE = @MAKE_BINDIST_FALSE@ -MAKE_BINDIST_TRUE = @MAKE_BINDIST_TRUE@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSDOS_COMPILE_FALSE = @MSDOS_COMPILE_FALSE@ -MSDOS_COMPILE_TRUE = @MSDOS_COMPILE_TRUE@ -MSGFMT = @MSGFMT@ -NEED_READLINE_FALSE = @NEED_READLINE_FALSE@ -NEED_READLINE_TRUE = @NEED_READLINE_TRUE@ -NETPLAY_LIBS = @NETPLAY_LIBS@ -NLS_LOCALEDIR = @NLS_LOCALEDIR@ -OBJC = @OBJC@ -OBJCDEPMODE = @OBJCDEPMODE@ -OBJCFLAGS = @OBJCFLAGS@ -OBJEXT = @OBJEXT@ -OS2_COMPILE_FALSE = @OS2_COMPILE_FALSE@ -OS2_COMPILE_TRUE = @OS2_COMPILE_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PKG_CONFIG = @PKG_CONFIG@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -READLINE = @READLINE@ -READLINE_LIBS = @READLINE_LIBS@ -RESID_DEP = @RESID_DEP@ -RESID_DIR = @RESID_DIR@ -RESID_INCLUDES = @RESID_INCLUDES@ -RESID_LIBS = @RESID_LIBS@ -RISCOS_COMPILE_FALSE = @RISCOS_COMPILE_FALSE@ -RISCOS_COMPILE_TRUE = @RISCOS_COMPILE_TRUE@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SOUND_AIX_OBJ = @SOUND_AIX_OBJ@ -SOUND_DRIVERS = @SOUND_DRIVERS@ -SOUND_HPUX_OBJ = @SOUND_HPUX_OBJ@ -SOUND_LIBS = @SOUND_LIBS@ -SOUND_MIDAS_OBJ = @SOUND_MIDAS_OBJ@ -SOUND_SDL_OBJ = @SOUND_SDL_OBJ@ -SOUND_SGI_OBJ = @SOUND_SGI_OBJ@ -SOUND_USS_OBJ = @SOUND_USS_OBJ@ -STRIP = @STRIP@ -TFE_LIBS = @TFE_LIBS@ -UI_LIBS = @UI_LIBS@ -UNIX_COMPILE_FALSE = @UNIX_COMPILE_FALSE@ -UNIX_COMPILE_TRUE = @UNIX_COMPILE_TRUE@ -UNIX_GP2X_COMPILE_FALSE = @UNIX_GP2X_COMPILE_FALSE@ -UNIX_GP2X_COMPILE_TRUE = @UNIX_GP2X_COMPILE_TRUE@ -UNIX_HPUX_COMPILE_FALSE = @UNIX_HPUX_COMPILE_FALSE@ -UNIX_HPUX_COMPILE_TRUE = @UNIX_HPUX_COMPILE_TRUE@ -UNIX_MACOSX_COMPILE_FALSE = @UNIX_MACOSX_COMPILE_FALSE@ -UNIX_MACOSX_COMPILE_TRUE = @UNIX_MACOSX_COMPILE_TRUE@ -UNIX_MACOSX_UITYPE = @UNIX_MACOSX_UITYPE@ -UNIX_OPENSERVER5_COMPILE_FALSE = @UNIX_OPENSERVER5_COMPILE_FALSE@ -UNIX_OPENSERVER5_COMPILE_TRUE = @UNIX_OPENSERVER5_COMPILE_TRUE@ -UNIX_OPENSERVER6_COMPILE_FALSE = @UNIX_OPENSERVER6_COMPILE_FALSE@ -UNIX_OPENSERVER6_COMPILE_TRUE = @UNIX_OPENSERVER6_COMPILE_TRUE@ -UNIX_QNX4_COMPILE_FALSE = @UNIX_QNX4_COMPILE_FALSE@ -UNIX_QNX4_COMPILE_TRUE = @UNIX_QNX4_COMPILE_TRUE@ -UNIX_QNX6_COMPILE_FALSE = @UNIX_QNX6_COMPILE_FALSE@ -UNIX_QNX6_COMPILE_TRUE = @UNIX_QNX6_COMPILE_TRUE@ -UNIX_SKYOS_COMPILE_FALSE = @UNIX_SKYOS_COMPILE_FALSE@ -UNIX_SKYOS_COMPILE_TRUE = @UNIX_SKYOS_COMPILE_TRUE@ -UNIX_SOLARIS_COMPILE_FALSE = @UNIX_SOLARIS_COMPILE_FALSE@ -UNIX_SOLARIS_COMPILE_TRUE = @UNIX_SOLARIS_COMPILE_TRUE@ -UNIX_UNIXWARE_COMPILE_FALSE = @UNIX_UNIXWARE_COMPILE_FALSE@ -UNIX_UNIXWARE_COMPILE_TRUE = @UNIX_UNIXWARE_COMPILE_TRUE@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_MIDAS_SOUND_FALSE = @USE_MIDAS_SOUND_FALSE@ -USE_MIDAS_SOUND_TRUE = @USE_MIDAS_SOUND_TRUE@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -VERSION_RC = @VERSION_RC@ -VICEDIR = @VICEDIR@ -VICE_LIBPNG = @VICE_LIBPNG@ -VICE_LIBPNG_DEP = @VICE_LIBPNG_DEP@ -VICE_LIBPNG_DIR = @VICE_LIBPNG_DIR@ -VICE_LIBPNG_INCLUDES = @VICE_LIBPNG_INCLUDES@ -VICE_SYNC = @VICE_SYNC@ -VICE_VERSION = @VICE_VERSION@ -VICE_VERSION_BUILD = @VICE_VERSION_BUILD@ -VICE_VERSION_MAJOR = @VICE_VERSION_MAJOR@ -VICE_VERSION_MINOR = @VICE_VERSION_MINOR@ -VICE_ZLIB = @VICE_ZLIB@ -VICE_ZLIB_DEP = @VICE_ZLIB_DEP@ -VICE_ZLIB_DIR = @VICE_ZLIB_DIR@ -VICE_ZLIB_INCLUDES = @VICE_ZLIB_INCLUDES@ -WIN32_COMPILE_FALSE = @WIN32_COMPILE_FALSE@ -WIN32_COMPILE_TRUE = @WIN32_COMPILE_TRUE@ -WINDRES = @WINDRES@ -WRC = @WRC@ -X128_WINRES = @X128_WINRES@ -X64_WINRES = @X64_WINRES@ -XCBM2_WINRES = @XCBM2_WINRES@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XPET_WINRES = @XPET_WINRES@ -XPLUS4_WINRES = @XPLUS4_WINRES@ -XVIC_WINRES = @XVIC_WINRES@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@ -am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -artsc_config = @artsc_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -cxx = @cxx@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sdl_config = @sdl_config@ -sharedstatedir = @sharedstatedir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -x128_LDFLAGS = @x128_LDFLAGS@ -x64_LDFLAGS = @x64_LDFLAGS@ -xcbm2_LDFLAGS = @xcbm2_LDFLAGS@ -xpet_LDFLAGS = @xpet_LDFLAGS@ -xplus4_LDFLAGS = @xplus4_LDFLAGS@ -xvic_LDFLAGS = @xvic_LDFLAGS@ -SUBDIRS = $(POSUB) src build data man doc -EXTRA_DIST = AUTHORS FEEDBACK COPYING INSTALL NEWS vice.spec -all: all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/po $(distdir)/src - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-recursive ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ - dist-tarZ dist-zip distcheck distclean distclean-generic \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am - - -.PHONY: x64 x128 xvic xpet xplus4 xcbm2 -x64: - (cd src; $(MAKE) x64-all) - -x128: - (cd src; $(MAKE) x128-all) - -xvic: - (cd src; $(MAKE) xvic-all) - -xpet: - (cd src; $(MAKE) xpet-all) - -xplus4: - (cd src; $(MAKE) xplus4-all) - -xcbm2: - (cd src; $(MAKE) xcbm2-all) - -install: installvice - -@AMIGA_COMPILE_TRUE@bindist: -@AMIGA_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) nozip $(top_srcdir) $(EXEEXT) - -@AMIGA_COMPILE_TRUE@bindistzip: -@AMIGA_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) zip $(top_srcdir) $(EXEEXT) - -@BEOS_COMPILE_TRUE@bindist: -@BEOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) nozip $(top_srcdir) - -@BEOS_COMPILE_TRUE@bindistzip: -@BEOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) zip $(top_srcdir) - -@MSDOS_COMPILE_TRUE@bindist: -@MSDOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) nozip $(top_srcdir) - -@MSDOS_COMPILE_TRUE@bindistzip: -@MSDOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) zip $(top_srcdir) - -@UNIX_GP2X_COMPILE_TRUE@bindist: -@UNIX_GP2X_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/gp2x/make-bindist.sh $(STRIP) $(VICE_VERSION) nozip $(top_srcdir) - -@UNIX_GP2X_COMPILE_TRUE@bindistzip: -@UNIX_GP2X_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/gp2x/make-bindist.sh $(STRIP) $(VICE_VERSION) zip $(top_srcdir) - -@UNIX_MACOSX_COMPILE_TRUE@bindist: -@UNIX_MACOSX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) nozip @UNIX_MACOSX_UITYPE@ - -@UNIX_MACOSX_COMPILE_TRUE@bindistzip: -@UNIX_MACOSX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) zip @UNIX_MACOSX_UITYPE@ - -@UNIX_SKYOS_COMPILE_TRUE@bindist: -@UNIX_SKYOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) nozip $(top_srcdir) - -@UNIX_SKYOS_COMPILE_TRUE@bindistzip: -@UNIX_SKYOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) zip $(top_srcdir) - -@UNIX_QNX6_COMPILE_TRUE@bindist: -@UNIX_QNX6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip $(top_srcdir) - -@UNIX_QNX6_COMPILE_TRUE@bindistzip: -@UNIX_QNX6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip $(top_srcdir) - -@UNIX_QNX4_COMPILE_TRUE@bindist: -@UNIX_QNX4_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx4/make-bindist.sh $(VICE_VERSION) $(prefix) nozip $(top_srcdir) - -@UNIX_QNX4_COMPILE_TRUE@bindistzip: -@UNIX_QNX4_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx4/make-bindist.sh $(VICE_VERSION) $(prefix) zip $(top_srcdir) - -@UNIX_HPUX_COMPILE_TRUE@bindist: -@UNIX_HPUX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/hpux/make-bindist.sh $(STRIP) $(PERL) $(VICE_VERSION) $(prefix) $(host_cpu) $(host_os) nozip $(top_srcdir) - -@UNIX_HPUX_COMPILE_TRUE@bindistzip: -@UNIX_HPUX_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/hpux/make-bindist.sh $(STRIP) $(PERL) $(VICE_VERSION) $(prefix) $(host_cpu) $(host_os) zip $(top_srcdir) - -@UNIX_SOLARIS_COMPILE_TRUE@bindist: -@UNIX_SOLARIS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sol $(infodir) $(mandir) $(top_srcdir) - -@UNIX_SOLARIS_COMPILE_TRUE@bindistzip: -@UNIX_SOLARIS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sol $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER5_COMPILE_TRUE@bindist: -@UNIX_OPENSERVER5_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco5 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER5_COMPILE_TRUE@bindistzip: -@UNIX_OPENSERVER5_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco5 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER6_COMPILE_TRUE@bindist: -@UNIX_OPENSERVER6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco6 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_OPENSERVER6_COMPILE_TRUE@bindistzip: -@UNIX_OPENSERVER6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco6 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_UNIXWARE_COMPILE_TRUE@bindist: -@UNIX_UNIXWARE_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco7 $(infodir) $(mandir) $(top_srcdir) - -@UNIX_UNIXWARE_COMPILE_TRUE@bindistzip: -@UNIX_UNIXWARE_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco7 $(infodir) $(mandir) $(top_srcdir) - -@WIN32_COMPILE_TRUE@bindist: -@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) nozip $(top_srcdir) - -@WIN32_COMPILE_TRUE@bindistzip: -@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) zip $(top_srcdir) - -@RISCOS_COMPILE_TRUE@bindist: -@RISCOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) nozip $(top_srcdir) - -@RISCOS_COMPILE_TRUE@bindistzip: -@RISCOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION_MAJOR) $(VICE_VERSION_MINOR) zip $(top_srcdir) - -@MAKE_BINDIST_TRUE@installvice: -@MAKE_BINDIST_TRUE@ echo this platform doesn\'t use \"make install\", use \"make bindist\" instead - -@MAKE_BINDIST_FALSE@installvice: install-recursive - -cleantrans: - rm `find $(top_srcdir) -name "*.po.c"` -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Added: branches/spiro/vice-1.22.14-autogen.sh/vice/autogen.sh =================================================================== --- branches/spiro/vice-1.22.14-autogen.sh/vice/autogen.sh (rev 0) +++ branches/spiro/vice-1.22.14-autogen.sh/vice/autogen.sh 2008-05-12 13:33:18 UTC (rev 18774) @@ -0,0 +1,104 @@ +#! /bin/sh + +# +# autogen.sh - generate the auto* files of VICE +# +# Written by +# Spiro Trikaliotis <spi...@gm...> +# +# This file is part of VICE, the Versatile Commodore Emulator. +# See README for copyright notice. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. +# + +do_command() { + # $1 - command + # $2 - options + + echo `pwd`: $1 $2 + $1 $2 > .$1.out 2>&1 + ret=$? + if [ ! $ret = 0 ] ; then + echo "ERROR: $1 failed in `pwd`" + exit 1 + fi +} + +do_aclocal() { + do_command aclocal +} + +do_autoconf() { + do_command autoconf -f +} + +do_autoheader() { + if [ ! x"`sed -ne "s/.*AM_CONFIG_HEADER\((.*)\).*/\1/p" configure.in`" = x ]; then + do_command autoheader + fi +} + +do_automake() { + do_command automake "-a -c" # " -f" +} + +buildfiles() { + FILES_TO_REMEMBER="INSTALL" + + # Save some files which should not be overwritten + + for A in $FILES_TO_REMEMBER; do + [ -e $A ] && mv $A $A.backup + done + + do_aclocal + + do_autoconf + do_autoheader + do_automake + + # Restore the files which should not be overwritten + + for A in $FILES_TO_REMEMBER; do + [ -e $A ] && mv $A.backup $A + done +} + +SUBDIRECTORIES=`sed -ne "s/.*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/p" configure.in` + +for A in $SUBDIRECTORIES; do + ( + cd $A + buildfiles + ) +done + +buildfiles + +if [ x"$1" == x"--dist" ]; then + + ./configure + (cd src/monitor/; make mon_lex.c mon_parse.c) + + (cd po; make cat-id-tbl.c) + + SVN_ADD_FILES="configure src/config.h.in config.guess config.sub src/monitor/mon_parse.c src/monitor/mon_parse.h src/monitor/mon_lex.c src/resid/depcomp src/resid/mkinstalldirs src/resid/missing src/resid/install-sh doc/texinfo.tex po/cat-id-tbl.c" + SVN_ADD_MAKEFILES="`find . -name Makefile.in`" + + svn add $SVN_ADD_FILES $SVN_ADD_MAKEFILES + +fi Property changes on: branches/spiro/vice-1.22.14-autogen.sh/vice/autogen.sh ___________________________________________________________________ Name: svn:executable + * Deleted: branches/spiro/vice-1.22.14-autogen.sh/vice/build/Makefile.in =================================================================== --- branches/spiro/vice-1.22.14-autogen.sh/vice/build/Makefile.in 2008-05-12 10:10:35 UTC (rev 18773) +++ branches/spiro/vice-1.22.14-autogen.sh/vice/build/Makefile.in 2008-05-12 13:33:18 UTC (rev 18774) @@ -1,487 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = build -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALTERNATE_DOCDIR_FALSE = @ALTERNATE_DOCDIR_FALSE@ -ALTERNATE_DOCDIR_TRUE = @ALTERNATE_DOCDIR_TRUE@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMIGA_COMPILE_FALSE = @AMIGA_COMPILE_FALSE@ -AMIGA_COMPILE_TRUE = @AMIGA_COMPILE_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -ARCH_DIR = @ARCH_DIR@ -ARCH_EXTRA_SUBDIR = @ARCH_EXTRA_SUBDIR@ -ARCH_INCLUDES = @ARCH_INCLUDES@ -ARCH_LIBS = @ARCH_LIBS@ -ARCH_SRC_DIR = @ARCH_SRC_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BEOS_COMPILE_FALSE = @BEOS_COMPILE_FALSE@ -BEOS_COMPILE_TRUE = @BEOS_COMPILE_TRUE@ -BINDIR = @BINDIR@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CROSS = @CROSS@ -CROSS_FALSE = @CROSS_FALSE@ -CROSS_TRUE = @CROSS_TRUE@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DOS_TFE_PCAP_LIB = @DOS_TFE_PCAP_LIB@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FCCACHE = @FCCACHE@ -FFMPEG_INCLUDES = @FFMPEG_INCLUDES@ -FFMPEG_LIBS = @FFMPEG_LIBS@ -FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@ -GENCAT = @GENCAT@ -GFXOUTPUT_DRIVERS = @GFXOUTPUT_DRIVERS@ -GFXOUTPUT_LIBS = @GFXOUTPUT_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEUI_FALSE = @GNOMEUI_FALSE@ -GNOMEUI_TRUE = @GNOMEUI_TRUE@ -GREP = @GREP@ -GTKGL_CFLAGS = @GTKGL_CFLAGS@ -GTKGL_LIBS = @GTKGL_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HAVE_FC_CACHE_FALSE = @HAVE_FC_CACHE_FALSE@ -HAVE_FC_CACHE_TRUE = @HAVE_FC_CACHE_TRUE@ -HAVE_RAWDRIVE_FALSE = @HAVE_RAWDRIVE_FALSE@ -HAVE_RAWDRIVE_TRUE = @HAVE_RAWDRIVE_TRUE@ -HAVE_READLINE = @HAVE_READLINE@ -HAVE_REALDEVICE_FALSE = @HAVE_REALDEVICE_FALSE@ -HAVE_REALDEVICE_TRUE = @HAVE_REALDEVICE_TRUE@ -HAVE_RESID_FALSE = @HAVE_RESID_FALSE@ -HAVE_RESID_TRUE = @HAVE_RESID_TRUE@ -HAVE_RS232_FALSE = @HAVE_RS232_FALSE@ -HAVE_RS232_TRUE = @HAVE_RS232_TRUE@ -HAVE_TRANSLATION_FALSE = @HAVE_TRANSLATION_FALSE@ -HAVE_TRANSLATION_TRUE = @HAVE_TRANSLATION_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -JOY_LIBS = @JOY_LIBS@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LINKCC = @LINKCC@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MACOSX_COCOA_FALSE = @MACOSX_COCOA_FALSE@ -MACOSX_COCOA_TRUE = @MACOSX_COCOA_TRUE@ -MAKEINFO = @MAKEINFO@ -MAKE_BINDIST_FALSE = @MAKE_BINDIST_FALSE@ -MAKE_BINDIST_TRUE = @MAKE_BINDIST_TRUE@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSDOS_COMPILE_FALSE = @MSDOS_COMPILE_FALSE@ -MSDOS_COMPILE_TRUE = @MSDOS_COMPILE_TRUE@ -MSGFMT = @MSGFMT@ -NEED_READLINE_FALSE = @NEED_READLINE_FALSE@ -NEED_READLINE_TRUE = @NEED_READLINE_TRUE@ -NETPLAY_LIBS = @NETPLAY_LIBS@ -NLS_LOCALEDIR = @NLS_LOCALEDIR@ -OBJC = @OBJC@ -OBJCDEPMODE = @OBJCDEPMODE@ -OBJCFLAGS = @OBJCFLAGS@ -OBJEXT = @OBJEXT@ -OS2_COMPILE_FALSE = @OS2_COMPILE_FALSE@ -OS2_COMPILE_TRUE = @OS2_COMPILE_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PKG_CONFIG = @PKG_CONFIG@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -READLINE = @READLINE@ -READLINE_LIBS = @READLINE_LIBS@ -RESID_DEP = @RESID_DEP@ -RESID_DIR = @RESID_DIR@ -RESID_INCLUDES = @RESID_INCLUDES@ -RESID_LIBS = @RESID_LIBS@ -RISCOS_COMPILE_FALSE = @RISCOS_COMPILE_FALSE@ -RISCOS_COMPILE_TRUE = @RISCOS_COMPILE_TRUE@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SOUND_AIX_OBJ = @SOUND_AIX_OBJ@ -SOUND_DRIVERS = @SOUND_DRIVERS@ -SOUND_HPUX_OBJ = @SOUND_HPUX_OBJ@ -SOUND_LIBS = @SOUND_LIBS@ -SOUND_MIDAS_OBJ = @SOUND_MIDAS_OBJ@ -SOUND_SDL_OBJ = @SOUND_SDL_OBJ@ -SOUND_SGI_OBJ = @SOUND_SGI_OBJ@ -SOUND_USS_OBJ = @SOUND_USS_OBJ@ -STRIP = @STRIP@ -TFE_LIBS = @TFE_LIBS@ -UI_LIBS = @UI_LIBS@ -UNIX_COMPILE_FALSE = @UNIX_COMPILE_FALSE@ -UNIX_COMPILE_TRUE = @UNIX_COMPILE_TRUE@ -UNIX_GP2X_COMPILE_FALSE = @UNIX_GP2X_COMPILE_FALSE@ -UNIX_GP2X_COMPILE_TRUE = @UNIX_GP2X_COMPILE_TRUE@ -UNIX_HPUX_COMPILE_FALSE = @UNIX_HPUX_COMPILE_FALSE@ -UNIX_HPUX_COMPILE_TRUE = @UNIX_HPUX_COMPILE_TRUE@ -UNIX_MACOSX_COMPILE_FALSE = @UNIX_MACOSX_COMPILE_FALSE@ -UNIX_MACOSX_COMPILE_TRUE = @UNIX_MACOSX_COMPILE_TRUE@ -UNIX_MACOSX_UITYPE = @UNIX_MACOSX_UITYPE@ -UNIX_OPENSERVER5_COMPILE_FALSE = @UNIX_OPENSERVER5_COMPILE_FALSE@ -UNIX_OPENSERVER5_COMPILE_TRUE = @UNIX_OPENSERVER5_COMPILE_TRUE@ -UNIX_OPENSERVER6_COMPILE_FALSE = @UNIX_OPENSERVER6_COMPILE_FALSE@ -UNIX_OPENSERVER6_COMPILE_TRUE = @UNIX_OPENSERVER6_COMPILE_TRUE@ -UNIX_QNX4_COMPILE_FALSE = @UNIX_QNX4_COMPILE_FALSE@ -UNIX_QNX4_COMPILE_TRUE = @UNIX_QNX4_COMPILE_TRUE@ -UNIX_QNX6_COMPILE_FALSE = @UNIX_QNX6_COMPILE_FALSE@ -UNIX_QNX6_COMPILE_TRUE = @UNIX_QNX6_COMPILE_TRUE@ -UNIX_SKYOS_COMPILE_FALSE = @UNIX_SKYOS_COMPILE_FALSE@ -UNIX_SKYOS_COMPILE_TRUE = @UNIX_SKYOS_COMPILE_TRUE@ -UNIX_SOLARIS_COMPILE_FALSE = @UNIX_SOLARIS_COMPILE_FALSE@ -UNIX_SOLARIS_COMPILE_TRUE = @UNIX_SOLARIS_COMPILE_TRUE@ -UNIX_UNIXWARE_COMPILE_FALSE = @UNIX_UNIXWARE_COMPILE_FALSE@ -UNIX_UNIXWARE_COMPILE_TRUE = @UNIX_UNIXWARE_COMPILE_TRUE@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_MIDAS_SOUND_FALSE = @USE_MIDAS_SOUND_FALSE@ -USE_MIDAS_SOUND_TRUE = @USE_MIDAS_SOUND_TRUE@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -VERSION_RC = @VERSION_RC@ -VICEDIR = @VICEDIR@ -VICE_LIBPNG = @VICE_LIBPNG@ -VICE_LIBPNG_DEP = @VICE_LIBPNG_DEP@ -VICE_LIBPNG_DIR = @VICE_LIBPNG_DIR@ -VICE_LIBPNG_INCLUDES = @VICE_LIBPNG_INCLUDES@ -VICE_SYNC = @VICE_SYNC@ -VICE_VERSION = @VICE_VERSION@ -VICE_VERSION_BUILD = @VICE_VERSION_BUILD@ -VICE_VERSION_MAJOR = @VICE_VERSION_MAJOR@ -VICE_VERSION_MINOR = @VICE_VERSION_MINOR@ -VICE_ZLIB = @VICE_ZLIB@ -VICE_ZLIB_DEP = @VICE_ZLIB_DEP@ -VICE_ZLIB_DIR = @VICE_ZLIB_DIR@ -VICE_ZLIB_INCLUDES = @VICE_ZLIB_INCLUDES@ -WIN32_COMPILE_FALSE = @WIN32_COMPILE_FALSE@ -WIN32_COMPILE_TRUE = @WIN32_COMPILE_TRUE@ -WINDRES = @WINDRES@ -WRC = @WRC@ -X128_WINRES = @X128_WINRES@ -X64_WINRES = @X64_WINRES@ -XCBM2_WINRES = @XCBM2_WINRES@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XPET_WINRES = @XPET_WINRES@ -XPLUS4_WINRES = @XPLUS4_WINRES@ -XVIC_WINRES = @XVIC_WINRES@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@ -am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -artsc_config = @artsc_config@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -cxx = @cxx@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sdl_config = @sdl_config@ -sharedstatedir = @sharedstatedir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -x128_LDFLAGS = @x128_LDFLAGS@ -x64_LDFLAGS = @x64_LDFLAGS@ -xcbm2_LDFLAGS = @xcbm2_LDFLAGS@ -xpet_LDFLAGS = @xpet_LDFLAGS@ -xplus4_LDFLAGS = @xplus4_LDFLAGS@ -xvic_LDFLAGS = @xvic_LDFLAGS@ -EXTRA_DIST = \ - amigaos/build-os4-native.sh \ - amigaos/build-vbcc.sh \ - beos/ppc-build.sh \ - mingw32/build-cross.sh \ - macosx/build-allext.sh \ - macosx/build-gtk.sh \ - macosx/build-hidutils.sh \ - macosx/build-inc.sh \ - macosx/build-pcaplibnet.sh \ - macosx/build-readline.sh \ - macosx/build-vice-dist.sh \ - macosx/build-ffmpeglame.sh \ - minix3/build.sh \ - minix3/build-package.sh \ - qnx4/build.sh \ - riscos/build-cross.sh \ - vms/build.sh - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu build/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/amigaos $(distdir)/beos $(distdir)/macosx $(distdir)/mingw32 $(distdir)/minix3 $(distdir)/qnx4 $(distdir)/riscos $(distdir)/vms - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Deleted: branches/spiro/vice-1.22.14-autogen.sh/vice/config.guess =================================================================== --- branches/spiro/vice-1.22.14-autogen.sh/vice/config.guess 2008-05-12 10:10:35 UTC (rev 18773) +++ branches/spiro/vice-1.22.14-autogen.sh/vice/config.guess 2008-05-12 13:33:18 UTC (rev 18774) @@ -1,1473 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - -timestamp='2005-07-08' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner <pe...@bo...>. -# Please send patches to <con...@gn...>. Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to <con...@gn...>." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir... [truncated message content] |
From: <st...@us...> - 2008-05-12 10:10:31
|
Revision: 18773 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18773&view=rev Author: strik Date: 2008-05-12 03:10:35 -0700 (Mon, 12 May 2008) Log Message: ----------- Branch for development on removing generated auto* files and let them be generated with an autogen.sh skript. Added Paths: ----------- branches/spiro/vice-1.22.14-autogen.sh/ Copied: branches/spiro/vice-1.22.14-autogen.sh (from rev 18772, trunk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-05-12 10:08:16
|
Revision: 18772 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18772&view=rev Author: strik Date: 2008-05-12 03:08:22 -0700 (Mon, 12 May 2008) Log Message: ----------- Generated Spiro's development branch. Added Paths: ----------- branches/spiro/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-05-07 17:50:36
|
Revision: 18771 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18771&view=rev Author: strik Date: 2008-05-07 10:50:17 -0700 (Wed, 07 May 2008) Log Message: ----------- Tagged v1.22.14. Added Paths: ----------- tags/v1.22/v1.22.14/ Copied: tags/v1.22/v1.22.14 (from rev 18770, trunk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-05-07 17:40:06
|
Revision: 18769 http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18769&view=rev Author: strik Date: 2008-05-07 10:21:10 -0700 (Wed, 07 May 2008) Log Message: ----------- 2008-05-01 Marco van den Heuvel <bla...@ya...> * configure.in, data/fonts/vice-cbm.bdf, data/fonts/Makefile.am: Added a check for the 'fc-cache' command, and use the .bdf font if not present. * doc/html/Makefile.am, doc/Makefile.am: Fixed the ALTERNATE_DOCDIR problems with automake. * arch/unix/x11/xaw/x11video.c: Added #ifdef HAVE_XVIDEO for some xvideo specific code. Modified Paths: -------------- trunk/vice/configure.in trunk/vice/data/fonts/Makefile.am trunk/vice/doc/Makefile.am trunk/vice/doc/html/Makefile.am trunk/vice/src/ChangeLog trunk/vice/src/arch/unix/x11/xaw/x11video.c Added Paths: ----------- trunk/vice/data/fonts/vice-cbm.bdf Modified: trunk/vice/configure.in =================================================================== --- trunk/vice/configure.in 2008-05-05 20:08:22 UTC (rev 18768) +++ trunk/vice/configure.in 2008-05-07 17:21:10 UTC (rev 18769) @@ -1216,6 +1216,13 @@ AC_DEFINE(USE_LAMEMP3,,[Enable lamemp3 support.])],,$SOUND_LIBS -lmpgdecoder) fi +AC_PATH_PROGS(FCCACHE, fc-cache, false) +if test x"$FCCACHE" = "xfalse"; then + AM_CONDITIONAL(HAVE_FC_CACHE, false) +else + AM_CONDITIONAL(HAVE_FC_CACHE, true) +fi + if test x"$is_amigaos4" = "xyes"; then AC_MSG_CHECKING(whether devices/timer.h defines TimeVal) AC_TRY_COMPILE([ #include <devices/timer.h> ], Modified: trunk/vice/data/fonts/Makefile.am =================================================================== --- trunk/vice/data/fonts/Makefile.am 2008-05-05 20:08:22 UTC (rev 18768) +++ trunk/vice/data/fonts/Makefile.am 2008-05-07 17:21:10 UTC (rev 18769) @@ -1,20 +1,26 @@ fontsdir = $(VICEDIR)/fonts fonts_DATA = \ + vice-cbm.bdf \ CBM.ttf EXTRA_DIST = $(fonts_DATA) cbm-directory-charset.fon install: install-data-am - @echo "Preparing fontdir, please wait..." ; \ - if [ ! `fc-cache --list > /dev/null 2>&1` ] ; then \ - if test "x${HOME}" != "x" ; then \ - mkdir ${HOME}/.fonts > /dev/null 2>&1 ; \ - cp $(fontsdir)/CBM.ttf ${HOME}/.fonts ; \ - fc-cache ; \ - else \ - echo '$$HOME not set... giving up.' ; \ - fi \ - else \ - echo 'fc-cache not available... giving up.' ; \ - fi +@HAVE_FC_CACHE_TRUE@ @echo "Preparing fontdir, please wait..." ; \ +@HAVE_FC_CACHE_TRUE@ if [ ! `fc-cache --list > /dev/null 2>&1` ] ; then \ +@HAVE_FC_CACHE_TRUE@ if test "x${HOME}" != "x" ; then \ +@HAVE_FC_CACHE_TRUE@ mkdir ${HOME}/.fonts > /dev/null 2>&1 ; \ +@HAVE_FC_CACHE_TRUE@ cp $(fontsdir)/CBM.ttf ${HOME}/.fonts ; \ +@HAVE_FC_CACHE_TRUE@ fc-cache ; \ +@HAVE_FC_CACHE_TRUE@ else \ +@HAVE_FC_CACHE_TRUE@ echo '$$HOME not set... giving up.' ; \ +@HAVE_FC_CACHE_TRUE@ fi \ +@HAVE_FC_CACHE_TRUE@ else \ +@HAVE_FC_CACHE_TRUE@ echo 'fc-cache not available... giving up.' ; \ +@HAVE_FC_CACHE_TRUE@ fi +@HAVE_FC_CACHE_FALSE@ @echo "Preparing fontdir..." ; \ +@HAVE_FC_CACHE_FALSE@ cd $(DESTDIR)$(fontsdir) ; \ +@HAVE_FC_CACHE_FALSE@ bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \ +@HAVE_FC_CACHE_FALSE@ rm vice-cbm.bdf ; \ +@HAVE_FC_CACHE_FALSE@ mkfontdir . Copied: trunk/vice/data/fonts/vice-cbm.bdf (from rev 18761, branches/marco/v1.22.13-fontfixing/vice/data/fonts/vice-cbm.bdf) =================================================================== --- trunk/vice/data/fonts/vice-cbm.bdf (rev 0) +++ trunk/vice/data/fonts/vice-cbm.bdf 2008-05-07 17:21:10 UTC (rev 18769) @@ -0,0 +1,2503 @@ +STARTFONT 2.1 +FONT -freetype-VICE CBM-medium-r-normal-medium-12-120-100-72-m-104-symbol-0 +SIZE 12 100 100 +FONTBOUNDINGBOX 8 8 0 0 +STARTPROPERTIES 16 +POINT_SIZE 120 +PIXEL_SIZE 12 +RESOLUTION_X 100 +RESOLUTION_Y 72 +FONT_ASCENT 8 +FONT_DESCENT 0 +AVERAGE_WIDTH 104 +SPACING "M" +FOUNDRY "FreeType" +FAMILY_NAME "VICE CBM" +CHARSET_REGISTRY "Symbol" +WEIGHT_NAME "Medium" +SLANT "R" +SETWIDTH_NAME "Normal" +COPYRIGHT "Typeface Commodore Business Machines" +_XMBDFED_INFO "Converted by MP, Edited with xmbdfed 4.3." +ENDPROPERTIES +CHARS 192 +STARTCHAR char32 +ENCODING 32 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 0 0 0 0 +BITMAP +ENDCHAR +STARTCHAR char33 +ENCODING 33 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 2 7 3 1 +BITMAP +C0 +C0 +C0 +C0 +00 +00 +C0 +ENDCHAR +STARTCHAR char34 +ENCODING 34 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 3 1 5 +BITMAP +CC +CC +CC +ENDCHAR +STARTCHAR char35 +ENCODING 35 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 7 0 1 +BITMAP +66 +66 +FF +66 +FF +66 +66 +ENDCHAR +STARTCHAR char36 +ENCODING 36 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +30 +7C +C0 +78 +0C +F8 +30 +ENDCHAR +STARTCHAR char37 +ENCODING 37 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +C4 +CC +18 +30 +60 +CC +8C +ENDCHAR +STARTCHAR char38 +ENCODING 38 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 7 1 1 +BITMAP +78 +CC +78 +70 +CE +CC +7E +ENDCHAR +STARTCHAR char39 +ENCODING 39 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 4 3 3 5 +BITMAP +30 +60 +C0 +ENDCHAR +STARTCHAR char40 +ENCODING 40 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 4 7 2 1 +BITMAP +30 +60 +C0 +C0 +C0 +60 +30 +ENDCHAR +STARTCHAR char41 +ENCODING 41 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 4 7 2 1 +BITMAP +C0 +60 +30 +30 +30 +60 +C0 +ENDCHAR +STARTCHAR char42 +ENCODING 42 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 5 0 2 +BITMAP +66 +3C +FF +3C +66 +ENDCHAR +STARTCHAR char43 +ENCODING 43 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 5 1 2 +BITMAP +30 +30 +FC +30 +30 +ENDCHAR +STARTCHAR char44 +ENCODING 44 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 3 3 2 0 +BITMAP +60 +60 +C0 +ENDCHAR +STARTCHAR char45 +ENCODING 45 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 1 1 4 +BITMAP +FC +ENDCHAR +STARTCHAR char46 +ENCODING 46 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 2 2 3 1 +BITMAP +C0 +C0 +ENDCHAR +STARTCHAR char47 +ENCODING 47 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 6 1 1 +BITMAP +06 +0C +18 +30 +60 +C0 +ENDCHAR +STARTCHAR char48 +ENCODING 48 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +78 +CC +DC +EC +CC +CC +78 +ENDCHAR +STARTCHAR char49 +ENCODING 49 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +30 +30 +70 +30 +30 +30 +FC +ENDCHAR +STARTCHAR char50 +ENCODING 50 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +78 +CC +0C +18 +60 +C0 +FC +ENDCHAR +STARTCHAR char51 +ENCODING 51 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +78 +CC +0C +38 +0C +CC +78 +ENDCHAR +STARTCHAR char52 +ENCODING 52 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 7 1 1 +BITMAP +0C +1C +3C +CC +FE +0C +0C +ENDCHAR +STARTCHAR char53 +ENCODING 53 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +FC +C0 +F8 +0C +0C +CC +78 +ENDCHAR +STARTCHAR char54 +ENCODING 54 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +78 +CC +C0 +F8 +CC +CC +78 +ENDCHAR +STARTCHAR char55 +ENCODING 55 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +FC +CC +18 +30 +30 +30 +30 +ENDCHAR +STARTCHAR char56 +ENCODING 56 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +78 +CC +CC +78 +CC +CC +78 +ENDCHAR +STARTCHAR char57 +ENCODING 57 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +78 +CC +CC +7C +0C +CC +78 +ENDCHAR +STARTCHAR char58 +ENCODING 58 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 2 4 3 2 +BITMAP +C0 +00 +00 +C0 +ENDCHAR +STARTCHAR char59 +ENCODING 59 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 3 6 2 0 +BITMAP +60 +00 +00 +60 +60 +C0 +ENDCHAR +STARTCHAR char60 +ENCODING 60 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +1C +30 +60 +C0 +60 +30 +1C +ENDCHAR +STARTCHAR char61 +ENCODING 61 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 3 1 3 +BITMAP +FC +00 +FC +ENDCHAR +STARTCHAR char62 +ENCODING 62 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +E0 +30 +18 +0C +18 +30 +E0 +ENDCHAR +STARTCHAR char63 +ENCODING 63 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +78 +CC +0C +18 +30 +00 +30 +ENDCHAR +STARTCHAR char0 +ENCODING 64 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +78 +CC +DC +DC +C0 +C4 +78 +ENDCHAR +STARTCHAR char1 +ENCODING 65 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +30 +78 +CC +FC +CC +CC +CC +ENDCHAR +STARTCHAR char2 +ENCODING 66 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +F8 +CC +CC +F8 +CC +CC +F8 +ENDCHAR +STARTCHAR char3 +ENCODING 67 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +78 +CC +C0 +C0 +C0 +CC +78 +ENDCHAR +STARTCHAR char4 +ENCODING 68 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +F0 +D8 +CC +CC +CC +D8 +F0 +ENDCHAR +STARTCHAR char5 +ENCODING 69 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +FC +C0 +C0 +F0 +C0 +C0 +FC +ENDCHAR +STARTCHAR char6 +ENCODING 70 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +FC +C0 +C0 +F0 +C0 +C0 +C0 +ENDCHAR +STARTCHAR char7 +ENCODING 71 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +78 +CC +C0 +DC +CC +CC +78 +ENDCHAR +STARTCHAR char8 +ENCODING 72 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +CC +CC +CC +FC +CC +CC +CC +ENDCHAR +STARTCHAR char9 +ENCODING 73 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 4 7 2 1 +BITMAP +F0 +60 +60 +60 +60 +60 +F0 +ENDCHAR +STARTCHAR char10 +ENCODING 74 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +3C +18 +18 +18 +18 +D8 +70 +ENDCHAR +STARTCHAR char11 +ENCODING 75 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +CC +D8 +F0 +E0 +F0 +D8 +CC +ENDCHAR +STARTCHAR char12 +ENCODING 76 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +C0 +C0 +C0 +C0 +C0 +C0 +FC +ENDCHAR +STARTCHAR char13 +ENCODING 77 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 7 1 1 +BITMAP +C6 +EE +FE +D6 +C6 +C6 +C6 +ENDCHAR +STARTCHAR char14 +ENCODING 78 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +CC +EC +FC +FC +DC +CC +CC +ENDCHAR +STARTCHAR char15 +ENCODING 79 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +78 +CC +CC +CC +CC +CC +78 +ENDCHAR +STARTCHAR char16 +ENCODING 80 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +F8 +CC +CC +F8 +C0 +C0 +C0 +ENDCHAR +STARTCHAR char17 +ENCODING 81 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +78 +CC +CC +CC +CC +78 +1C +ENDCHAR +STARTCHAR char18 +ENCODING 82 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +F8 +CC +CC +F8 +F0 +D8 +CC +ENDCHAR +STARTCHAR char19 +ENCODING 83 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +78 +CC +C0 +78 +0C +CC +78 +ENDCHAR +STARTCHAR char20 +ENCODING 84 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +FC +30 +30 +30 +30 +30 +30 +ENDCHAR +STARTCHAR char21 +ENCODING 85 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +CC +CC +CC +CC +CC +CC +78 +ENDCHAR +STARTCHAR char22 +ENCODING 86 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +CC +CC +CC +CC +CC +78 +30 +ENDCHAR +STARTCHAR char23 +ENCODING 87 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 7 1 1 +BITMAP +C6 +C6 +C6 +D6 +FE +EE +C6 +ENDCHAR +STARTCHAR char24 +ENCODING 88 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +CC +CC +78 +30 +78 +CC +CC +ENDCHAR +STARTCHAR char25 +ENCODING 89 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +CC +CC +CC +78 +30 +30 +30 +ENDCHAR +STARTCHAR char26 +ENCODING 90 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +FC +0C +18 +30 +60 +C0 +FC +ENDCHAR +STARTCHAR char27 +ENCODING 91 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 4 7 2 1 +BITMAP +F0 +C0 +C0 +C0 +C0 +C0 +F0 +ENDCHAR +STARTCHAR char28 +ENCODING 92 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 7 0 1 +BITMAP +0C +12 +30 +7C +30 +62 +FC +ENDCHAR +STARTCHAR char29 +ENCODING 93 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 4 7 2 1 +BITMAP +F0 +30 +30 +30 +30 +30 +F0 +ENDCHAR +STARTCHAR char30 +ENCODING 94 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 0 +BITMAP +30 +78 +FC +30 +30 +30 +30 +ENDCHAR +STARTCHAR char31 +ENCODING 95 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 6 1 1 +BITMAP +20 +60 +FE +FE +60 +20 +ENDCHAR +STARTCHAR char64 +ENCODING 96 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 3 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char65 +ENCODING 97 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 7 1 1 +BITMAP +10 +38 +7C +FE +FE +38 +7C +ENDCHAR +STARTCHAR char66 +ENCODING 98 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +18 +18 +18 +18 +18 +18 +18 +18 +ENDCHAR +STARTCHAR char67 +ENCODING 99 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 3 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char68 +ENCODING 100 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 4 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char69 +ENCODING 101 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 5 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char70 +ENCODING 102 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 2 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char71 +ENCODING 103 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +30 +30 +30 +30 +30 +30 +30 +30 +ENDCHAR +STARTCHAR char72 +ENCODING 104 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +0C +0C +0C +0C +0C +0C +0C +0C +ENDCHAR +STARTCHAR char73 +ENCODING 105 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 0 0 +BITMAP +E0 +F0 +38 +18 +18 +ENDCHAR +STARTCHAR char74 +ENCODING 106 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 3 3 +BITMAP +C0 +C0 +E0 +78 +38 +ENDCHAR +STARTCHAR char75 +ENCODING 107 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 0 3 +BITMAP +18 +18 +38 +F0 +E0 +ENDCHAR +STARTCHAR char76 +ENCODING 108 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +C0 +C0 +C0 +C0 +C0 +C0 +FF +FF +ENDCHAR +STARTCHAR char77 +ENCODING 109 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +C0 +E0 +70 +38 +1C +0E +07 +03 +ENDCHAR +STARTCHAR char78 +ENCODING 110 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +03 +07 +0E +1C +38 +70 +E0 +C0 +ENDCHAR +STARTCHAR char79 +ENCODING 111 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +FF +FF +C0 +C0 +C0 +C0 +C0 +C0 +ENDCHAR +STARTCHAR char80 +ENCODING 112 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +FF +FF +03 +03 +03 +03 +03 +03 +ENDCHAR +STARTCHAR char81 +ENCODING 113 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 6 1 1 +BITMAP +78 +FC +FC +FC +FC +78 +ENDCHAR +STARTCHAR char82 +ENCODING 114 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 1 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char83 +ENCODING 115 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 7 1 1 +BITMAP +6C +FE +FE +FE +7C +38 +10 +ENDCHAR +STARTCHAR char84 +ENCODING 116 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +60 +60 +60 +60 +60 +60 +60 +60 +ENDCHAR +STARTCHAR char85 +ENCODING 117 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 3 0 +BITMAP +38 +78 +E0 +C0 +C0 +ENDCHAR +STARTCHAR char86 +ENCODING 118 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +C3 +E7 +7E +3C +3C +7E +E7 +C3 +ENDCHAR +STARTCHAR char87 +ENCODING 119 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 6 1 1 +BITMAP +78 +FC +CC +CC +FC +78 +ENDCHAR +STARTCHAR char88 +ENCODING 120 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +30 +30 +CC +CC +30 +30 +78 +ENDCHAR +STARTCHAR char89 +ENCODING 121 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +06 +06 +06 +06 +06 +06 +06 +06 +ENDCHAR +STARTCHAR char90 +ENCODING 122 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 7 1 1 +BITMAP +10 +38 +7C +FE +7C +38 +10 +ENDCHAR +STARTCHAR char91 +ENCODING 123 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +18 +18 +18 +FF +FF +18 +18 +18 +ENDCHAR +STARTCHAR char92 +ENCODING 124 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +C0 +C0 +30 +30 +C0 +C0 +30 +30 +ENDCHAR +STARTCHAR char93 +ENCODING 125 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +18 +18 +18 +18 +18 +18 +18 +18 +ENDCHAR +STARTCHAR char94 +ENCODING 126 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 5 1 1 +BITMAP +06 +7C +EC +6C +6C +ENDCHAR +STARTCHAR char95 +ENCODING 127 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +FF +7F +3F +1F +0F +07 +03 +01 +ENDCHAR +STARTCHAR char96 +ENCODING 160 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 0 0 0 0 +BITMAP +ENDCHAR +STARTCHAR char97 +ENCODING 161 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +F0 +F0 +F0 +F0 +F0 +F0 +F0 +F0 +ENDCHAR +STARTCHAR char98 +ENCODING 162 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 4 0 0 +BITMAP +FF +FF +FF +FF +ENDCHAR +STARTCHAR char99 +ENCODING 163 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 1 0 7 +BITMAP +FF +ENDCHAR +STARTCHAR char100 +ENCODING 164 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 1 0 0 +BITMAP +FF +ENDCHAR +STARTCHAR char101 +ENCODING 165 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +C0 +C0 +C0 +C0 +C0 +C0 +C0 +C0 +ENDCHAR +STARTCHAR char102 +ENCODING 166 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +CC +CC +33 +33 +CC +CC +33 +33 +ENDCHAR +STARTCHAR char103 +ENCODING 167 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +03 +03 +03 +03 +03 +03 +03 +03 +ENDCHAR +STARTCHAR char104 +ENCODING 168 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 4 0 0 +BITMAP +CC +CC +33 +33 +ENDCHAR +STARTCHAR char105 +ENCODING 169 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +FF +FE +FC +F8 +F0 +E0 +C0 +80 +ENDCHAR +STARTCHAR char106 +ENCODING 170 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +03 +03 +03 +03 +03 +03 +03 +03 +ENDCHAR +STARTCHAR char107 +ENCODING 171 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +18 +18 +18 +1F +1F +18 +18 +18 +ENDCHAR +STARTCHAR char108 +ENCODING 172 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 4 4 4 0 +BITMAP +F0 +F0 +F0 +F0 +ENDCHAR +STARTCHAR char109 +ENCODING 173 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 3 3 +BITMAP +C0 +C0 +C0 +F8 +F8 +ENDCHAR +STARTCHAR char110 +ENCODING 174 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 0 0 +BITMAP +F8 +F8 +18 +18 +18 +ENDCHAR +STARTCHAR char111 +ENCODING 175 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 0 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char112 +ENCODING 176 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 3 0 +BITMAP +F8 +F8 +C0 +C0 +C0 +ENDCHAR +STARTCHAR char113 +ENCODING 177 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 5 0 3 +BITMAP +18 +18 +18 +FF +FF +ENDCHAR +STARTCHAR char114 +ENCODING 178 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 5 0 0 +BITMAP +FF +FF +18 +18 +18 +ENDCHAR +STARTCHAR char115 +ENCODING 179 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +18 +18 +18 +F8 +F8 +18 +18 +18 +ENDCHAR +STARTCHAR char116 +ENCODING 180 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +C0 +C0 +C0 +C0 +C0 +C0 +C0 +C0 +ENDCHAR +STARTCHAR char117 +ENCODING 181 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +E0 +E0 +E0 +E0 +E0 +E0 +E0 +E0 +ENDCHAR +STARTCHAR char118 +ENCODING 182 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +07 +07 +07 +07 +07 +07 +07 +07 +ENDCHAR +STARTCHAR char119 +ENCODING 183 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 6 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char120 +ENCODING 184 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 3 0 5 +BITMAP +FF +FF +FF +ENDCHAR +STARTCHAR char121 +ENCODING 185 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 3 0 0 +BITMAP +FF +FF +FF +ENDCHAR +STARTCHAR char122 +ENCODING 186 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +03 +03 +03 +03 +03 +03 +FF +FF +ENDCHAR +STARTCHAR char123 +ENCODING 187 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 4 4 0 0 +BITMAP +F0 +F0 +F0 +F0 +ENDCHAR +STARTCHAR char124 +ENCODING 188 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 4 4 4 4 +BITMAP +F0 +F0 +F0 +F0 +ENDCHAR +STARTCHAR char125 +ENCODING 189 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 0 3 +BITMAP +18 +18 +18 +F8 +F8 +ENDCHAR +STARTCHAR char126 +ENCODING 190 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 4 4 0 4 +BITMAP +F0 +F0 +F0 +F0 +ENDCHAR +STARTCHAR char127 +ENCODING 191 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +F0 +F0 +F0 +F0 +0F +0F +0F +0F +ENDCHAR +STARTCHAR char64 +ENCODING 192 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 3 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char65 +ENCODING 193 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 7 1 1 +BITMAP +10 +38 +7C +FE +FE +38 +7C +ENDCHAR +STARTCHAR char66 +ENCODING 194 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +18 +18 +18 +18 +18 +18 +18 +18 +ENDCHAR +STARTCHAR char67 +ENCODING 195 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 3 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char68 +ENCODING 196 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 4 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char69 +ENCODING 197 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 5 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char70 +ENCODING 198 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 2 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char71 +ENCODING 199 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +30 +30 +30 +30 +30 +30 +30 +30 +ENDCHAR +STARTCHAR char72 +ENCODING 200 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +0C +0C +0C +0C +0C +0C +0C +0C +ENDCHAR +STARTCHAR char73 +ENCODING 201 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 0 0 +BITMAP +E0 +F0 +38 +18 +18 +ENDCHAR +STARTCHAR char74 +ENCODING 202 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 3 3 +BITMAP +C0 +C0 +E0 +78 +38 +ENDCHAR +STARTCHAR char75 +ENCODING 203 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 0 3 +BITMAP +18 +18 +38 +F0 +E0 +ENDCHAR +STARTCHAR char76 +ENCODING 204 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +C0 +C0 +C0 +C0 +C0 +C0 +FF +FF +ENDCHAR +STARTCHAR char77 +ENCODING 205 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +C0 +E0 +70 +38 +1C +0E +07 +03 +ENDCHAR +STARTCHAR char78 +ENCODING 206 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +03 +07 +0E +1C +38 +70 +E0 +C0 +ENDCHAR +STARTCHAR char79 +ENCODING 207 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +FF +FF +C0 +C0 +C0 +C0 +C0 +C0 +ENDCHAR +STARTCHAR char80 +ENCODING 208 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +FF +FF +03 +03 +03 +03 +03 +03 +ENDCHAR +STARTCHAR char81 +ENCODING 209 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 6 1 1 +BITMAP +78 +FC +FC +FC +FC +78 +ENDCHAR +STARTCHAR char82 +ENCODING 210 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 1 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char83 +ENCODING 211 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 7 1 1 +BITMAP +6C +FE +FE +FE +7C +38 +10 +ENDCHAR +STARTCHAR char84 +ENCODING 212 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +60 +60 +60 +60 +60 +60 +60 +60 +ENDCHAR +STARTCHAR char85 +ENCODING 213 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 3 0 +BITMAP +38 +78 +E0 +C0 +C0 +ENDCHAR +STARTCHAR char86 +ENCODING 214 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +C3 +E7 +7E +3C +3C +7E +E7 +C3 +ENDCHAR +STARTCHAR char87 +ENCODING 215 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 6 1 1 +BITMAP +78 +FC +CC +CC +FC +78 +ENDCHAR +STARTCHAR char88 +ENCODING 216 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 6 7 1 1 +BITMAP +30 +30 +CC +CC +30 +30 +78 +ENDCHAR +STARTCHAR char89 +ENCODING 217 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +06 +06 +06 +06 +06 +06 +06 +06 +ENDCHAR +STARTCHAR char90 +ENCODING 218 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 7 1 1 +BITMAP +10 +38 +7C +FE +7C +38 +10 +ENDCHAR +STARTCHAR char91 +ENCODING 219 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +18 +18 +18 +FF +FF +18 +18 +18 +ENDCHAR +STARTCHAR char92 +ENCODING 220 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +C0 +C0 +30 +30 +C0 +C0 +30 +30 +ENDCHAR +STARTCHAR char93 +ENCODING 221 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +18 +18 +18 +18 +18 +18 +18 +18 +ENDCHAR +STARTCHAR char94 +ENCODING 222 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 5 1 1 +BITMAP +06 +7C +EC +6C +6C +ENDCHAR +STARTCHAR char95 +ENCODING 223 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +FF +7F +3F +1F +0F +07 +03 +01 +ENDCHAR +STARTCHAR char96 +ENCODING 224 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 0 0 0 0 +BITMAP +ENDCHAR +STARTCHAR char97 +ENCODING 225 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +F0 +F0 +F0 +F0 +F0 +F0 +F0 +F0 +ENDCHAR +STARTCHAR char98 +ENCODING 226 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 4 0 0 +BITMAP +FF +FF +FF +FF +ENDCHAR +STARTCHAR char99 +ENCODING 227 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 1 0 7 +BITMAP +FF +ENDCHAR +STARTCHAR char100 +ENCODING 228 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 1 0 0 +BITMAP +FF +ENDCHAR +STARTCHAR char101 +ENCODING 229 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +C0 +C0 +C0 +C0 +C0 +C0 +C0 +C0 +ENDCHAR +STARTCHAR char102 +ENCODING 230 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +CC +CC +33 +33 +CC +CC +33 +33 +ENDCHAR +STARTCHAR char103 +ENCODING 231 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +03 +03 +03 +03 +03 +03 +03 +03 +ENDCHAR +STARTCHAR char104 +ENCODING 232 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 4 0 0 +BITMAP +CC +CC +33 +33 +ENDCHAR +STARTCHAR char105 +ENCODING 233 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +FF +FE +FC +F8 +F0 +E0 +C0 +80 +ENDCHAR +STARTCHAR char106 +ENCODING 234 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +03 +03 +03 +03 +03 +03 +03 +03 +ENDCHAR +STARTCHAR char107 +ENCODING 235 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +18 +18 +18 +1F +1F +18 +18 +18 +ENDCHAR +STARTCHAR char108 +ENCODING 236 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 4 4 4 0 +BITMAP +F0 +F0 +F0 +F0 +ENDCHAR +STARTCHAR char109 +ENCODING 237 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 3 3 +BITMAP +C0 +C0 +C0 +F8 +F8 +ENDCHAR +STARTCHAR char110 +ENCODING 238 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 0 0 +BITMAP +F8 +F8 +18 +18 +18 +ENDCHAR +STARTCHAR char111 +ENCODING 239 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 0 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char112 +ENCODING 240 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 3 0 +BITMAP +F8 +F8 +C0 +C0 +C0 +ENDCHAR +STARTCHAR char113 +ENCODING 241 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 5 0 3 +BITMAP +18 +18 +18 +FF +FF +ENDCHAR +STARTCHAR char114 +ENCODING 242 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 5 0 0 +BITMAP +FF +FF +18 +18 +18 +ENDCHAR +STARTCHAR char115 +ENCODING 243 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +18 +18 +18 +F8 +F8 +18 +18 +18 +ENDCHAR +STARTCHAR char116 +ENCODING 244 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +C0 +C0 +C0 +C0 +C0 +C0 +C0 +C0 +ENDCHAR +STARTCHAR char117 +ENCODING 245 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +E0 +E0 +E0 +E0 +E0 +E0 +E0 +E0 +ENDCHAR +STARTCHAR char118 +ENCODING 246 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +07 +07 +07 +07 +07 +07 +07 +07 +ENDCHAR +STARTCHAR char119 +ENCODING 247 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 2 0 6 +BITMAP +FF +FF +ENDCHAR +STARTCHAR char120 +ENCODING 248 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 3 0 5 +BITMAP +FF +FF +FF +ENDCHAR +STARTCHAR char121 +ENCODING 249 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 3 0 0 +BITMAP +FF +FF +FF +ENDCHAR +STARTCHAR char122 +ENCODING 250 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 8 8 0 0 +BITMAP +03 +03 +03 +03 +03 +03 +FF +FF +ENDCHAR +STARTCHAR char123 +ENCODING 251 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 4 4 0 0 +BITMAP +F0 +F0 +F0 +F0 +ENDCHAR +STARTCHAR char124 +ENCODING 252 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 4 4 4 4 +BITMAP +F0 +F0 +F0 +F0 +ENDCHAR +STARTCHAR char125 +ENCODING 253 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 5 5 0 3 +BITMAP +18 +18 +18 +F8 +F8 +ENDCHAR +STARTCHAR char126 +ENCODING 254 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 4 4 0 4 +BITMAP +F0 +F0 +F0 +F0 +ENDCHAR +STARTCHAR char94 +ENCODING 255 +SWIDTH 480 0 +DWIDTH 8 0 +BBX 7 5 1 1 +BITMAP +06 +7C +EC +6C +6C +ENDCHAR +ENDFONT Modified: trunk/vice/doc/Makefile.am =================================================================== --- trunk/vice/doc/Makefile.am 2008-05-05 20:08:22 UTC (rev 18768) +++ trunk/vice/doc/Makefile.am 2008-05-07 17:21:10 UTC (rev 18769) @@ -1,8 +1,5 @@ -if ALTERNATE_DOCDIR -docdir = $(prefix)/share/doc/vice -else -docdir = $(VICEDIR)/doc -endif +@ALTERNATE_DOCDIR_TRUE@docdir = $(prefix)/share/doc/vice +@ALTERNATE_DOCDIR_FALSE@docdir = $(VICEDIR)/doc doc_DATA = \ Minix-Howto.txt \ @@ -25,4 +22,3 @@ EXTRA_DIST = $(doc_DATA) SUBDIRS = html - Modified: trunk/vice/doc/html/Makefile.am =================================================================== --- trunk/vice/doc/html/Makefile.am 2008-05-05 20:08:22 UTC (rev 18768) +++ trunk/vice/doc/html/Makefile.am 2008-05-07 17:21:10 UTC (rev 18769) @@ -1,8 +1,5 @@ -if ALTERNATE_DOCDIR -docdir = $(prefix)/share/doc/vice -else -docdir = $(VICEDIR)/doc -endif +@ALTERNATE_DOCDIR_TRUE@docdir = $(prefix)/share/doc/vice +@ALTERNATE_DOCDIR_FALSE@docdir = $(VICEDIR)/doc doc_DATA = \ amigaos.html \ Modified: trunk/vice/src/ChangeLog =================================================================== --- trunk/vice/src/ChangeLog 2008-05-05 20:08:22 UTC (rev 18768) +++ trunk/vice/src/ChangeLog 2008-05-07 17:21:10 UTC (rev 18769) @@ -1,3 +1,15 @@ +2008-05-01 Marco van den Heuvel <bla...@ya...> + + * configure.in, data/fonts/vice-cbm.bdf, + data/fonts/Makefile.am: Added a check for the 'fc-cache' + command, and use the .bdf font if not present. + + * doc/html/Makefile.am, doc/Makefile.am: Fixed the + ALTERNATE_DOCDIR problems with automake. + + * arch/unix/x11/xaw/x11video.c: Added #ifdef HAVE_XVIDEO for + some xvideo specific code. + 2008-04-28 Andreas Matthies <and...@gm...> * arch/win32/ui.c (ui_shutdown): Call uikeyboard_shutdown. Modified: trunk/vice/src/arch/unix/x11/xaw/x11video.c =================================================================== --- trunk/vice/src/arch/unix/x11/xaw/x11video.c 2008-05-05 20:08:22 UTC (rev 18768) +++ trunk/vice/src/arch/unix/x11/xaw/x11video.c 2008-05-07 17:21:10 UTC (rev 18769) @@ -686,7 +686,6 @@ #ifdef HAVE_XVIDEO /* Request specified video format. */ canvas->xv_format.id = fourcc; -#endif if (!find_yuv_port(x11ui_get_display_ptr(), &canvas->xv_port, &canvas->xv_format)) { @@ -696,6 +695,9 @@ } resources_set_int("HwScalePossible", 0); } +#else + resources_set_int("HwScalePossible", 0); +#endif if (video_arch_frame_buffer_alloc(canvas, new_width, new_height) < 0) { return NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |