From 5a635ebdb35a5f925b6c99490b34dbd7d3e484ef Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Sun, 5 Dec 2010 19:12:42 +0000 Subject: [PATCH] Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage. Originally committed to SVN as r4895. --- aegisub/{Makefile.am => Makefile} | 70 +- aegisub/Makefile.inc.in | 174 ++ aegisub/Makefile.target | 175 ++ aegisub/autogen.sh | 68 +- aegisub/automation/{Makefile.am => Makefile} | 38 +- aegisub/config.guess | 1407 +++++++++++++++ aegisub/config.sub | 1504 +++++++++++++++++ aegisub/configure.in | 184 +- aegisub/desktop/16x16/{ => apps}/aegisub.png | Bin aegisub/desktop/22x22/{ => apps}/aegisub.png | Bin aegisub/desktop/24x24/{ => apps}/aegisub.png | Bin aegisub/desktop/32x32/{ => apps}/aegisub.png | Bin aegisub/desktop/48x48/{ => apps}/aegisub.png | Bin aegisub/desktop/64x64/{ => apps}/aegisub.png | Bin aegisub/desktop/Makefile | 51 + aegisub/desktop/Makefile.am | 45 - .../desktop/scalable/{ => apps}/aegisub.svg | 0 aegisub/install-sh | 519 ++++++ aegisub/libaegisub/Makefile | 47 + aegisub/libaegisub/Makefile.am | 50 - aegisub/libass/Makefile | 23 + aegisub/libass/Makefile.am | 24 - aegisub/libffms/{Makefile.am => Makefile} | 17 +- aegisub/po/ChangeLog | 0 aegisub/po/LINGUAS | 17 - aegisub/po/Makefile | 41 + aegisub/po/Makevars | 11 - aegisub/po/POTFILES.in | 505 ------ aegisub/po/{read me JP.txt => README_ja.txt} | 380 ++--- aegisub/po/make_pot.bat | 4 - aegisub/po/mkwin32layout.py | 19 - aegisub/reporter/Makefile | 57 + aegisub/reporter/Makefile.am | 51 - aegisub/src/Makefile | 274 +++ aegisub/src/Makefile.am | 314 ---- aegisub/src/bitmaps/Makefile.am | 6 - .../src/libresrc/{Makefile.am => Makefile} | 20 +- aegisub/tests/Makefile | 31 + aegisub/tests/Makefile.am | 25 - aegisub/tools/Makefile | 24 + aegisub/tools/Makefile.am | 15 - .../{Makefile.am => Makefile} | 38 +- 42 files changed, 4700 insertions(+), 1528 deletions(-) rename aegisub/{Makefile.am => Makefile} (51%) create mode 100644 aegisub/Makefile.inc.in create mode 100644 aegisub/Makefile.target rename aegisub/automation/{Makefile.am => Makefile} (57%) create mode 100755 aegisub/config.guess create mode 100755 aegisub/config.sub rename aegisub/desktop/16x16/{ => apps}/aegisub.png (100%) rename aegisub/desktop/22x22/{ => apps}/aegisub.png (100%) rename aegisub/desktop/24x24/{ => apps}/aegisub.png (100%) rename aegisub/desktop/32x32/{ => apps}/aegisub.png (100%) rename aegisub/desktop/48x48/{ => apps}/aegisub.png (100%) rename aegisub/desktop/64x64/{ => apps}/aegisub.png (100%) create mode 100644 aegisub/desktop/Makefile delete mode 100644 aegisub/desktop/Makefile.am rename aegisub/desktop/scalable/{ => apps}/aegisub.svg (100%) create mode 100755 aegisub/install-sh create mode 100644 aegisub/libaegisub/Makefile delete mode 100644 aegisub/libaegisub/Makefile.am create mode 100644 aegisub/libass/Makefile delete mode 100644 aegisub/libass/Makefile.am rename aegisub/libffms/{Makefile.am => Makefile} (53%) delete mode 100644 aegisub/po/ChangeLog delete mode 100644 aegisub/po/LINGUAS create mode 100644 aegisub/po/Makefile delete mode 100644 aegisub/po/Makevars delete mode 100644 aegisub/po/POTFILES.in rename aegisub/po/{read me JP.txt => README_ja.txt} (94%) delete mode 100644 aegisub/po/make_pot.bat delete mode 100644 aegisub/po/mkwin32layout.py create mode 100644 aegisub/reporter/Makefile delete mode 100644 aegisub/reporter/Makefile.am create mode 100644 aegisub/src/Makefile delete mode 100644 aegisub/src/Makefile.am delete mode 100644 aegisub/src/bitmaps/Makefile.am rename aegisub/src/libresrc/{Makefile.am => Makefile} (64%) create mode 100644 aegisub/tests/Makefile delete mode 100644 aegisub/tests/Makefile.am create mode 100644 aegisub/tools/Makefile delete mode 100644 aegisub/tools/Makefile.am rename aegisub/universalchardet/{Makefile.am => Makefile} (51%) diff --git a/aegisub/Makefile.am b/aegisub/Makefile similarity index 51% rename from aegisub/Makefile.am rename to aegisub/Makefile index 9ee61c036..a5b81f814 100644 --- a/aegisub/Makefile.am +++ b/aegisub/Makefile @@ -1,19 +1,16 @@ -AUTOMAKE_OPTIONS = foreign +include Makefile.inc - -if WITH_INTERNAL_LIBASS -libass = libass +ifeq (yes, $(WITH_LIBASS)) +SUBDIRS += libass endif -if HAVE_PROVIDER_FFMPEGSOURCE -ffmpegsource = libffms +ifeq (yes, $(HAVE_PROVIDER_FFMPEGSOURCE)) +SUBDIRS += libffms endif -SUBDIRS = \ +SUBDIRS += \ universalchardet \ libaegisub \ - $(ffmpegsource) \ - $(libass) \ tools \ src \ reporter \ @@ -21,32 +18,40 @@ SUBDIRS = \ desktop \ po +all: ; + +ifeq (yes, $(BUILD_DARWIN)) osx-bundle: - @SHELL@ tools/osx-bundle.sh "@BUNDLE_STRING@" @AEGISUB_VERSION_DATA@ DICT_DIR=$(DICT_DIR) + $(BIN_SHELL) tools/osx-bundle.sh "$(BUNDLE_STRING)" $(AEGISUB_VERSION_DATA) DICT_DIR=$(DICT_DIR) osx-dmg: - @SHELL@ tools/osx-dmg.sh "@BUNDLE_STRING@" "@DMG_STRING@" + $(BIN_SHELL) tools/osx-dmg.sh "$(BUNDLE_STRING)" "$(DMG_STRING)" osx-tinderbox-bundle: - @SHELL@ tools/osx-bundle.sh "$(T_BUNDLE)" @AEGISUB_VERSION_DATA@ DICT_DIR="$(DICT_DIR)" + $(BIN_SHELL) tools/osx-bundle.sh "$(T_BUNDLE)" $(AEGISUB_VERSION_DATA) DICT_DIR="$(DICT_DIR)" osx-tinderbox-dmg: - @SHELL@ tools/osx-dmg.sh "$(T_DMG)" "$(T_BUNDLE)" - mv "$(T_DMG).dmg" bundle.dmg + $(BIN_SHELL) tools/osx-dmg.sh "$(T_DMG)" "$(T_BUNDLE)" + $(BIN_MV) "$(T_DMG).dmg" bundle.dmg +endif + EXTRA_DIST = \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ - config.guess \ - config.sub \ - depcomp \ - install-sh \ - LICENCE \ - missing \ INSTALL \ + LICENCE \ README \ - svn_revision + acinclude.m4 \ + autogen.sh \ + configure.in \ + acconf.h.in\ + configure \ + svn_revision \ + config.log \ + install-sh \ + Makefile.inc \ + Makefile.inc.in \ + Makefile.target + # m4macros/ EXTRA_DIST += \ @@ -73,7 +78,16 @@ EXTRA_DIST += \ packages/osx_dmg/dmg_set_style.applescript -CLEANFILES= \ - intltool-extract \ - intltool-merge \ - intltool-update +DISTCLEANFILES += \ + acconf.h \ + configure \ + acconf.h.in~ \ + svn_revision \ + Makefile.inc \ + config.log \ + acconf.h.in \ + config.status \ + autom4te.cache \ + aclocal.m4 \ + +include Makefile.target diff --git a/aegisub/Makefile.inc.in b/aegisub/Makefile.inc.in new file mode 100644 index 000000000..e26efc520 --- /dev/null +++ b/aegisub/Makefile.inc.in @@ -0,0 +1,174 @@ +######################### +# AEGISUB FEATURE SUPPORT +######################### +HAVE_ALSA = @with_alsa@ +HAVE_AUTO4_LUA = @with_auto4_lua@ +HAVE_AUTOMATION = @with_automation@ +HAVE_FFMPEG = @agi_cv_with_ffmpeg@ +HAVE_HUNSPELL = @with_hunspell@ +HAVE_OPENAL = @with_openal@ +HAVE_OPENMP = @with_openmp@ +HAVE_OSS = @with_oss@ +HAVE_PORTAUDIO = @with_portaudio@ +HAVE_PROVIDER_FFMPEGSOURCE = @with_provider_ffmpegsource@ +HAVE_PULSEAUDIO = @with_pulseaudio@ +WITH_EXTERNAL_LIBASS = @with_external_libass@ +WITH_LIBASS = @with_libass@ +FOUND_AUDIO_PLAYER = @found_audio_player@ +FOUND_VIDEO_PROVIDER = @found_video_provider@ + + +################### +# PLATFORM SETTINGS +################### +BUILD_BSD = @build_bsd@ +BUILD_DARWIN = @build_darwin@ +BUILD_DEFAULT = @build_default@ +BUILD_LINUX = @build_linux@ + + +####### +# FLAGS +####### +CFLAGS = @CFLAGS@ +CXXFLAGS = @CXXFLAGS@ +CPPFLAGS = @CPPFLAGS@ +CFLAGS_DEP = -MD -MP +LDFLAGS = @LDFLAGS@ +INSTALL_FLAGS = -m 664 +CCACHE_ENV = CCACHE_SLOPPINESS=time_macros +LIB_SHARED_LINK = -shared -Wl,-soname -Wl,$(LIB_SHARED_FULL) +LIB_SHARED_LINK_OSX = -dynamiclib -Wl,-undefined -Wl,dynamic_lookup -compatibility_version $(LIB_VERSION) -current_version $(LIB_VERSION) -Wl,-single_module -mmacosx-version-min=10.5 -install_name ${CURDIR}/$(LIB_SHARED_FULL) + + +######### +# STRINGS +######### +AEGISUB_COMMAND =@AEGISUB_COMMAND@ +AEGISUB_VERSION_DATA =@AEGISUB_VERSION_DATA@ +BUILD_DATE =@BUILD_DATE@ +PACKAGE_DEBUG =@PACKAGE_DEBUG@ +SVN_REVISION =@SVN_REVISION@ +DEBUG_FLAGS =@DEBUG_FLAGS@ +# OS X +BUNDLE_STRING =@BUNDLE_STRING@ +DARWIN_ARCH =@DARWIN_ARCH@ +DMG_STRING =@DMG_STRING@ +GETTEXT_PACKAGE =@GETTEXT_PACKAGE@ + + +####### +# PATHS +####### +P_PREFIX =@prefix@ +prefix = ${P_PREFIX} +P_PREFIX_EXEC =@exec_prefix@ +exec_prefix = ${P_PREFIX_EXEC} +P_BINDIR =@bindir@ +P_SBINDIR =@sbindir@ +P_LIBEXEC =@libexecdir@ +P_DATAROOT =@datarootdir@ +P_SYSCONF =@sysconfdir@ +P_SHAREDSTATE =@sharedstatedir@ +P_LOCALSTATE =@localstatedir@ +P_INCLUDE =@includedir@ +P_LIB =@libdir@ +P_LOCALE =$(P_DATAROOT)/locale + +P_DESKTOP =@P_DESKTOP@ +P_ICON =@P_ICON@ +P_DATA =$(P_DATAROOT)/aegisub/$(AEGISUB_VERSION_DATA) +P_DOC =$(P_DATAROOT)/doc/aegisub/$(AEGISUB_VERSION_DATA) + + + +############### +# LIBRARY FLAGS +############### +CXXFLAGS_WX = @WX_CXXFLAGS@ +CXXFLAGS_OPENMP = @OPENMP_CXXFLAGS@ + +CPPFLAGS_WX = @WX_CPPFLAGS@ + +CFLAGS_FONTCONFIG = @FONTCONFIG_CFLAGS@ +CFLAGS_FREETYPE = @FREETYPE_CFLAGS@ +CFLAGS_GL = @GL_CFLAGS@ +CFLAGS_FFMPEGSOURCE = -I../libffms/include +CFLAGS_HUNSPELL = @HUNSPELL_CFLAGS@ +CFLAGS_ICONV = @ICONV_CFLAGS@ +CFLAGS_LIBASS = -I../libass +#CFLAGS_LIBASS = @LIBASS_CFLAGS@ +CFLAGS_LIBAVCODEC = @LIBAVCODEC_CFLAGS@ +CFLAGS_LIBAVFORMAT = @LIBAVFORMAT_CFLAGS@ +CFLAGS_LIBAVUTIL = @LIBAVUTIL_CFLAGS@ +CFLAGS_LIBCURL = @LIBCURL_CFLAGS@ +CFLAGS_LIBPOSTPROC = @LIBPOSTPROC_CFLAGS@ +CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@ +CFLAGS_LIBSWSCALE = @LIBSWSCALE_CFLAGS@ +CFLAGS_LUA = @LUA_CFLAGS@ +CFLAGS_OPENAL = @OPENAL_CFLAGS@ +CFLAGS_PORTAUDIO = @PORTAUDIO_CFLAGS@ +CFLAGS_PTHREAD = @PTHREAD_CFLAGS@ +CFLAGS_UCHARDET = -I../universalchardet +CFLAGS_WX = @WX_CFLAGS@ + +LDFLAGS_ALSA = @ALSA_LDFLAGS@ +LDFLAGS_FONTCONFIG = @FONTCONFIG_LIBS@ +LDFLAGS_FREETYPE = @FREETYPE_LIBS@ +LDFLAGS_GL = @GL_LIBS@ +LDFLAGS_FFMPEGSOURCE = ../libffms/libffmpegsource_aegisub.a +LDFLAGS_HUNSPELL = @HUNSPELL_LIBS@ +LDFLAGS_ICONV = @ICONV_LDFLAGS@ +LDFLAGS_LIBASS = ../libass/libass_aegisub.a +#LDFLAGS_LIBASS = @LIBASS_LIBS@ +LDFLAGS_LIBAVCODEC = @LIBAVCODEC_LIBS@ +LDFLAGS_LIBAVFORMAT = @LIBAVFORMAT_LIBS@ +LDFLAGS_LIBAVUTIL = @LIBAVUTIL_LIBS@ +LDFLAGS_LIBCURL = @LIBCURL_LIBS@ +LDFLAGS_LIBPOSTPROC = @LIBPOSTPROC_LIBS@ +LDFLAGS_LIBPULSE = @LIBPULSE_LIBS@ +LDFLAGS_LIBSWSCALE = @LIBSWSCALE_LIBS@ +LDFLAGS_LUA = @LUA_LDFLAGS@ +LDFLAGS_OPENAL = @OPENAL_LIBS@ +LDFLAGS_PTHREAD = @PTHREAD_LIBS@ +LDFLAGS_PORTAUDIO = @PORTAUDIO_LIBS@ +LDFLAGS_UCHARDET ?= ../universalchardet/libuniversalchardet.a +LDFLAGS_WX = @WX_LIBS@ + + +##################### +# DEBUG / DEVELOPMENT +##################### +PRECOMPILED_HEADER = @enable_gcc_prec@ +CCACHE_ENABLE = @enable_ccache@ +LDFLAGS_CCMALLOC = @CCMALLOC_LDFLAGS@ +LDFLAGS_DEBUG = @DEBUG_FLAGS@ +LDFLAGS_EFENCE = @EFENCE_LDFLAGS@ +LDFLAGS_GCOV = @GCOV_LDFLAGS@ + +CFLAGS_DEBUG = @DEBUG_FLAGS@ +CFLAGS_EFENCE = @EFENCE_LDFLAGS@ +CFLAGS_GCOV = @GCOV_CFLAGS@ + + +########## +# BINARIES +########## +BIN_AR = ar +BIN_RANLIB = ranlib +BIN_LN = ln +BIN_RM = rm +BIN_SHELL = @SHELL@ +BIN_MV = mv +BIN_SED = sed +BIN_INSTALL = @INSTALL@ +BIN_MSGMERGE = @MSGMERGE@ +BIN_XGETTEXT = @XGETTEXT@ +BIN_MSGFMT = @MSGFMT@ +BIN_CC = @CC@ +BIN_CXX = @CXX@ +BIN_CP = cp +BIN_MKDIR = mkdir +BIN_MKDIR_P = mkdir -p +BIN_ECHO = echo +BIN_TOUCH = touch diff --git a/aegisub/Makefile.target b/aegisub/Makefile.target new file mode 100644 index 000000000..4e7a24faa --- /dev/null +++ b/aegisub/Makefile.target @@ -0,0 +1,175 @@ +# *** THERE ARE NO USER-EDITABLE ITEMS HERE. *** + + +.PHONY: all install clean subdirs $(SUBDIRS) +all: subdirs $(LIB) $(LIB_SHARED) $(PROGRAM) + +OBJ = $(addsuffix .o, $(basename $(SRC))) +DEP = $(addsuffix .d, $(basename $(SRC))) + +################### +# PLATFORM SPECIFIC +################### + +ifeq (yes, $(BUILD_DARWIN)) +LIB_SHARED_LINK = $(LIB_SHARED_LINK_OSX) +endif + + +########### +# LIBRARIES +########### +$(LIB) : $(OBJ) + $(BIN_AR) cru $@ $(OBJ) + $(BIN_RANLIB) $@ + +ifdef LIB_SHARED +LIB_SHARED_FULL = $(LIB_SHARED).$(LIB_VERSION) +$(LIB_SHARED) : $(OBJ) + $(BIN_CXX) $(LIB_SHARED_LINK) $(OBJ) -o $(LIB_SHARED_FULL) + $(BIN_LN) -s $(LIB_SHARED_FULL) $(LIB_SHARED) + +CLEANFILES+= $(LIB_SHARED_FULL) +endif + + +########## +# PROGRAMS +########## +$(PROGRAM): $(OBJ) + $(BIN_CXX) -o $@ $(LDFLAGS) $(OBJ) $(LDFLAGS_POST) + + +########## +# CLEANING +########## +clean: $(SUBDIRS) + $(BIN_RM) -f $(OBJ) $(CLEANFILES) $(LIB) $(LIB_SHARED) $(PROGRAM) + +distclean: clean + $(BIN_RM) -rf $(DISTCLEANFILES) $(DEP) +ifdef PRECOMPILED_HEADER_NAME + $(BIN_RM) -f $(PRECOMPILED_HEADER_NAME).gch +endif + + +######### +# INSTALL +######### +ifeq (install, $(MAKECMDGOALS)) +INSTALL_LIB = $(addprefix $(P_LIB)/, $(LIB_SHARED) $(LIB_SHARED_FULL)) +endif + +install: $(SUBDIRS) install-share install-program install-lib + +install-program: +ifdef PROGRAM_INSTALL + @$(BIN_MKDIR) -p $(P_BINDIR) + @$(BIN_INSTALL) $(PROGRAM) $(P_BINDIR)/$(PROGRAM) +endif + +install-lib: +ifdef LIB_SHARED_INSTALL + $(BIN_MKDIR) -p $(P_LIB) + $(BIN_INSTALL) $(LIB_SHARED_FULL) $(P_LIB)/$(LIB_SHARED_FULL) + $(BIN_LN) -sf $(P_LIB)/$(LIB_SHARED_FULL) $(P_LIB)/$(LIB_SHARED) +endif + +install-share: +ifdef DATA_SHARE + @$(BIN_MKDIR) -p $(addprefix $(P_DATA)/, $(dir $(DATA_SHARE))) + @for i in $(DATA_SHARE); do \ + $(BIN_ECHO) "$(BIN_INSTALL) $$i $(P_DATA)/$$i"; \ + $(BIN_INSTALL) $$i $(P_DATA)/$$i; \ + done +endif +ifdef DATA_SHARE_DOC + @$(BIN_MKDIR) -p $(addprefix $(P_DOC)/, $(dir $(DATA_SHARE_DOC))) + @for i in $(DATA_SHARE_DOC); do \ + $(BIN_ECHO) "$(BIN_INSTALL) $$i $(P_DOC)/$$i"; \ + $(BIN_INSTALL) $$i $(P_DOC)/$$i; \ + done +endif + + + +############## +# DISTRIBUTION +############## +distdir: + @if ! test -f packages/distfile/distfile.sh; then \ + echo "Please run this from the parent directory."; \ + exit 1; \ + fi + ${SHELL} packages/distfile/distfile.sh + +distfiles: $(SUBDIRS) + @for i in $(SRC) $(HEADER) $(EXTRA_DIST); do \ + echo $(CURDIR)/$$i; \ + done + + +######################## +# SUBDIRECTORY TRAVERSAL +######################## +subdirs: $(SUBDIRS) + +$(SUBDIRS): + $(MAKE) -C $@ $(MAKECMDGOALS) + +# Set relations to ensure dependencies are built before their targets during parallel builds. +src: universalchardet libass libffms tools libaegisub +tests: libaegisub +reporter: src + + + + +#################### +# PRECOMPILED HEADER +#################### +ifeq (yes, $(PRECOMPILED_HEADER)) + ifdef PRECOMPILED_HEADER_NAME + CXXFLAGS += -include $(PRECOMPILED_HEADER_NAME) -Winvalid-pch -fpch-deps -fpch-preprocess + # This hack is required until we can use the 'private' keyword (gmake 3.82) to avoid all the + # per-object CXXFLAGS being triggered by the ($OBJ) line. + CXXFLAGS_GNU_MAKE_SUCKS := $(CXXFLAGS) + $(OBJ): | $(PRECOMPILED_HEADER_NAME).gch + $(PRECOMPILED_HEADER_NAME).gch: CXXFLAGS = $(CXXFLAGS_GNU_MAKE_SUCKS) + endif +endif + + +######## +# CCACHE +######## +ifeq (yes, $(CCACHE_ENABLE)) +CXX_ENV = $(CCACHE_ENV) +BIN_CC := ccache $(BIN_CC) +BIN_CXX := ccache $(BIN_CXX) +endif + + +################## +# TRANSFORM RULES +################## +.SUFFIXES: +.SUFFIXES: .o .c .cpp .cxx + +%.o: %.c + $(CXX_ENV) $(BIN_CC) $(CFLAGS_DEP) $(CFLAGS) $(CXXFLAGS) -c -o $@ $< + +%.o: %.cpp + $(CXX_ENV) $(BIN_CXX) $(CFLAGS_DEP) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< + +%.o: %.cxx + $(CXX_ENV) $(BIN_CXX) $(CFLAGS_DEP) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< + +$(PRECOMPILED_HEADER_NAME).gch: $(PRECOMPILED_HEADER_NAME) + $(CXX_ENV) $(BIN_CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $< + + + + +-include ($DEP) +.SUFFIXES: diff --git a/aegisub/autogen.sh b/aegisub/autogen.sh index 8faf3479d..967ad52c3 100755 --- a/aegisub/autogen.sh +++ b/aegisub/autogen.sh @@ -10,21 +10,16 @@ # directly. ACLOCAL=${ACLOCAL-aclocal-1.10} -LIBTOOLIZE=${LIBTOOLIZE-libtoolize} AUTOHEADER=${AUTOHEADER-autoheader} AUTOMAKE=${AUTOMAKE-automake-1.10} AUTOCONF=${AUTOCONF-autoconf} -GETTEXTIZE=${GETTEXTIZE-glib-gettextize} -INTLTOOLIZE=${INTLTOOLIZE-intltoolize} GLIB_REQUIRED_VERSION=2.10.0 AUTOCONF_REQUIRED_VERSION=2.54 AUTOMAKE_REQUIRED_VERSION=1.10 -INTLTOOL_REQUIRED_VERSION=0.31 -LIBTOOL_REQUIRED_VERSION=1.5 -REQUIRED_M4="fontutil.m4 glib-gettext.m4 intltool.m4 intl.m4 pkg.m4 iconv.m4" +REQUIRED_M4="fontutil.m4 gettext.m4 pkg.m4 iconv.m4" REQUIRED_M4_WX="wxwin29.m4 wxwin.m4" PROJECT="aegisub" @@ -92,26 +87,6 @@ check_version () DIE=0 -$ECHO_N "checking for libtool >= $LIBTOOL_REQUIRED_VERSION ... " -if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1; then - LIBTOOLIZE=$LIBTOOLIZE -elif (glibtoolize --version) < /dev/null > /dev/null 2>&1; then - LIBTOOLIZE=glibtoolize -else - echo - echo " You must have libtool installed to compile $PROJECT." - echo " Install the appropriate package for your distribution," - echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - echo - DIE=1 -fi - -if test x$LIBTOOLIZE != x; then - VER=`$LIBTOOLIZE --version \ - | grep libtool | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"` - check_version $VER $LIBTOOL_REQUIRED_VERSION -fi - $ECHO_N "checking for autoconf >= $AUTOCONF_REQUIRED_VERSION ... " if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1; then VER=`$AUTOCONF --version | head -n 1 \ @@ -157,35 +132,6 @@ if test x$AUTOMAKE != x; then fi -$ECHO_N "checking for $GETTEXTIZE ... " -if ($GETTEXTIZE --version) < /dev/null > /dev/null 2>&1; then - VER=`$GETTEXTIZE --version \ - | grep glib-gettextize | sed "s/.* \([0-9.]*\)/\1/"` - check_version $VER $GLIB_REQUIRED_VERSION -else - echo - echo " You must have glib-gettextize installed to compile $PROJECT." - echo " glib-gettextize is part of glib-2.0, so you should already" - echo " have it. Make sure it is in your PATH." - echo - DIE=1 -fi - - -$ECHO_N "checking for $INTLTOOLIZE >= $INTLTOOL_REQUIRED_VERSION ... " -if ($INTLTOOLIZE --version) < /dev/null > /dev/null 2>&1; then - VER=`$INTLTOOLIZE --version \ - | grep intltoolize | sed "s/.* \([0-9.]*\)/\1/"` - check_version $VER $INTLTOOL_REQUIRED_VERSION -else - echo - echo " You must have intltool installed to compile $PROJECT." - echo " Get the latest version from" - echo " ftp://ftp.gnome.org/pub/GNOME/sources/intltool/" - echo - DIE=1 -fi - if test -z "$BIN_AWK"; then BIN_AWK=`which awk` fi @@ -274,24 +220,12 @@ if test $RC -ne 0; then exit $RC fi -echo "--- $LIBTOOLIZE ---" -$LIBTOOLIZE --force || exit $? - echo "--- $AUTOHEADER ---" $AUTOHEADER || exit $? -echo "--- $AUTOMAKE ---" -$AUTOMAKE --add-missing || exit $? - echo "--- $AUTOCONF ---" $AUTOCONF || exit $? -echo "--- $GETTEXTIZE ---" -$GETTEXTIZE --force || exit $? - -echo "--- $INTLTOOLIZE ---" -$INTLTOOLIZE --force --automake || exit $? - cd $ORIGDIR if ! test "$1" = "--skip-configure"; then diff --git a/aegisub/automation/Makefile.am b/aegisub/automation/Makefile similarity index 57% rename from aegisub/automation/Makefile.am rename to aegisub/automation/Makefile index 054813ef9..b70f8938f 100644 --- a/aegisub/automation/Makefile.am +++ b/aegisub/automation/Makefile @@ -1,8 +1,7 @@ -automationdir = $(aegisubdatadir)/automation -share_docdir = $(aegisubdocdir) +include ../Makefile.inc # share/ -data_auto4_lua = \ +DATA_AUTOMATION += \ autoload/cleantags-autoload.lua \ autoload/kara-templater.lua \ autoload/karaoke-auto-leadin.lua \ @@ -17,8 +16,7 @@ data_auto4_lua = \ # share/doc - -data_general_doc = \ +DATA_GENERAL_DOC = \ demos/raytracer-test1.ass \ v4-docs/basic-function-interface.txt \ v4-docs/configuration-dialogs.txt \ @@ -29,27 +27,25 @@ data_general_doc = \ v4-docs/subtitle-data.txt \ v4-docs/template-scripting-ideas.ass -data_auto4_lua_doc = \ +DATA_AUTOMATION_DOC += \ demos/future-windy-blur.lua \ demos/raytracer.lua +all: ; -nobase_share_doc_DATA = -nobase_automation_DATA = -if HAVE_AUTOMATION -nobase_automation_DATA += $(data_general) -nobase_share_doc_DATA += $(data_general_doc) -endif - -if HAVE_AUTO4_LUA -nobase_automation_DATA += $(data_auto4_lua) -nobase_share_doc_DATA += $(data_auto4_lua_doc) -endif +install: install-share + @$(BIN_MKDIR) -p $(addprefix $(P_DATA)/automation/, $(dir $(DATA_AUTOMATION))) + @for i in $(DATA_AUTOMATION); do \ + $(BIN_ECHO) "$(BIN_INSTALL) $$i $(P_DATA)/automation/$$i"; \ + $(BIN_INSTALL) $$i $(P_DATA)/automation/$$i; \ + done +DATA_SHARE_DOC = $(DATA_GENERAL_DOC) $(DATA_AUTOMATION_DOC) EXTRA_DIST = \ - $(data_general) \ - $(data_auto4_lua) \ - $(data_general_doc) \ - $(data_auto4_lua_doc) + $(DATA_AUTOMATION) \ + $(DATA_GENERAL_DOC) \ + $(DATA_AUTOMATION_DOC) + +include ../Makefile.target diff --git a/aegisub/config.guess b/aegisub/config.guess new file mode 100755 index 000000000..0e30d56e9 --- /dev/null +++ b/aegisub/config.guess @@ -0,0 +1,1407 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +timestamp='2003-07-02' + +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 . +# Please send patches to . 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 ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +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 0 ;; + --version | -v ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # 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 ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 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 + +# 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 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + arc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mipseb-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + wgrisc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + alpha:OSF1:*:*) + if test $UNAME_RELEASE = "V4.0"; then + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + fi + # 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 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/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; + Alpha*:OpenVMS:*:*) + echo alpha-hp-vms + exit 0 ;; + 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 0 ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit 0 ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit 0;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit 0 ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit 0 ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit 0 ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit 0;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit 0;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (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 0 ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7 && exit 0 ;; + esac ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + i86pc:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + 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 0 ;; + 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 0 ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit 0 ;; + 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 0 ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit 0 ;; + # 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 0 ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit 0 ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit 0 ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit 0 ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit 0 ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit 0 ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit 0 ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit 0 ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit 0 ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* 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 \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && exit 0 + echo mips-mips-riscos${UNAME_RELEASE} + exit 0 ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit 0 ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit 0 ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit 0 ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit 0 ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit 0 ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit 0 ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit 0 ;; + 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 0 ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit 0 ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit 0 ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit 0 ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit 0 ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit 0 ;; + ????????: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 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit 0 ;; + 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 0 ;; + *: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 + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + echo rs6000-ibm-aix3.2.5 + 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 0 ;; + *: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 0 ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit 0 ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit 0 ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit 0 ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit 0 ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit 0 ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit 0 ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit 0 ;; + 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 + #include + + 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 + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit 0 ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit 0 ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + 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 && $dummy && exit 0 + echo unknown-hitachi-hiuxwe2 + exit 0 ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit 0 ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit 0 ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit 0 ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit 0 ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit 0 ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit 0 ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit 0 ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit 0 ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit 0 ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit 0 ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit 0 ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit 0 ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + 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 0 ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + *:UNICOS/mp:*:*) + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + 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 0 ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit 0 ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; + *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) + # Determine whether the default compiler uses glibc. + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #if __GLIBC__ >= 2 + LIBC=gnu + #else + LIBC= + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + # GNU/FreeBSD systems have a "k" prefix to indicate we are using + # FreeBSD's kernel, but not the complete OS. + case ${LIBC} in gnu) kernel_only='k' ;; esac + echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + exit 0 ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit 0 ;; + i*:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit 0 ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit 0 ;; + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit 0 ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit 0 ;; + 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 0 ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit 0 ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit 0 ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + *:GNU:*:*) + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit 0 ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit 0 ;; + arm*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + 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}-unknown-linux-gnu" && exit 0 + ;; + 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}-unknown-linux-gnu" && exit 0 + ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit 0 ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit 0 ;; + 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}-unknown-linux-gnu${LIBC} + exit 0 ;; + 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-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit 0 ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit 0 ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit 0 ;; + 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}-pc-linux-gnu" + ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit 0 ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit 0 ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #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 +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + ;; + 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 0 ;; + 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 0 ;; + 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 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; + 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 0 ;; + i*86:*:5:[78]*) + 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-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit 0 ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /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 0 ;; + 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 0 ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit 0 ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit 0 ;; + 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 0 ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit 0 ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit 0 ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit 0 ;; + M68*:*:R3V[567]*:*) + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + 3[34]??:*: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) + 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 0 + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && echo i486-ncr-sysv4 && exit 0 ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit 0 ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit 0 ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit 0 ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit 0 ;; + *: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 0 ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit 0 ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit 0 ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit 0 ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit 0 ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit 0 ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit 0 ;; + 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 0 ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit 0 ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit 0 ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit 0 ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit 0 ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit 0 ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit 0 ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:Darwin:*:*) + case `uname -p` in + *86) UNAME_PROCESSOR=i686 ;; + powerpc) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit 0 ;; + *: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 0 ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit 0 ;; + NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit 0 ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit 0 ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit 0 ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit 0 ;; + *: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 0 ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit 0 ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit 0 ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit 0 ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit 0 ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit 0 ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit 0 ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit 0 ;; +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 < +# include +#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 + 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"); 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 +# 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 && $dummy && exit 0 + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } + +# 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 0 ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit 0 ;; + c34*) + echo c34-convex-bsd + exit 0 ;; + c38*) + echo c38-convex-bsd + exit 0 ;; + c4*) + echo c4-convex-bsd + exit 0 ;; + esac +fi + +cat >&2 < 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: diff --git a/aegisub/config.sub b/aegisub/config.sub new file mode 100755 index 000000000..9d7f73390 --- /dev/null +++ b/aegisub/config.sub @@ -0,0 +1,1504 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +timestamp='2003-07-04' + +# 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., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, 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 . 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 ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +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 0 ;; + --version | -v ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # 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 0;; + + * ) + 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* | kfreebsd*-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) + 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] \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k \ + | m32r | m68000 | m68k | m88k | mcore \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | msp430 \ + | ns16k | ns32k \ + | openrisc | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ + | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xscale | xstormy16 | xtensa \ + | z8k) + 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]-* | amd64-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* \ + | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | 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-* \ + | m32r-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | msp430-* \ + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ + | ymp-* \ + | z8k-*) + ;; + # 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 + ;; + 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 + ;; + 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 + ;; + crds | unos) + basic_machine=m68k-crds + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + 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-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + mmix*) + basic_machine=mmix-knuth + os=-mmixware + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + nv1) + basic_machine=nv1-cray + os=-unicosmp + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + or32 | or32-*) + basic_machine=or32-unknown + os=-coff + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc) basic_machine=powerpc-unknown + ;; + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparc | sparcv9 | sparcv9b) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ + | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + # This also exists in the configure program, but was not the + # default. + # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-ibm) + os=-aix + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/aegisub/configure.in b/aegisub/configure.in index c9e0b3597..22990e53b 100644 --- a/aegisub/configure.in +++ b/aegisub/configure.in @@ -38,7 +38,6 @@ m4_define([libass_required_version], [0.9.7]) ####### AC_INIT([Aegisub], [aegisub_version],, [aegisub]) AC_CONFIG_SRCDIR([src/main.cpp]) -AM_INIT_AUTOMAKE AC_CONFIG_HEADER([acconf.h]) AC_GNU_SOURCE AC_CANONICAL_HOST @@ -57,6 +56,11 @@ case x"$target" in esac AC_MSG_RESULT([$target_or_host]) +build_darwin="no" +build_linux="no" +build_bsd="no" +build_default="no" + case "$target_or_host" in *-*-darwin*) build_darwin="yes" @@ -107,16 +111,11 @@ fi # Used for universalchardet. AC_AGI_MDCPUCFG($target_or_host) -AM_CONDITIONAL([BUILD_BSD], [test "$build_bsd" = "yes"]) -AM_CONDITIONAL([BUILD_LINUX], [test "$build_linux" = "yes"]) -# For conditional file building and options in Makefile(s). -AM_CONDITIONAL([BUILD_DARWIN], [test "$build_darwin" = "yes"]) -AM_CONDITIONAL([BUILD_DEFAULT], [test "$build_default" = "yes"]) - -# FontConfig is used on Darwin for the fontlister, freetype for !Windows case. -AM_CONDITIONAL([FONTLISTER_FONTCONFIG], [test "$build_darwin" != "yes"]) -AM_CONDITIONAL([FONTLISTER_FREETYPE], [test "$build_darwin" = "yes"]) +AC_SUBST(build_bsd) +AC_SUBST(build_linux) +AC_SUBST(build_darwin) +AC_SUBST(build_default) # Handle endianess. AC_C_BIGENDIAN( @@ -142,25 +141,31 @@ AEGISUB_VERSION_DATA=aegisub_version_data AC_DEFINE_UNQUOTED(AEGISUB_VERSION_DATA, ["$AEGISUB_VERSION_DATA"], [Data path suffix.]) AC_SUBST(AEGISUB_VERSION_DATA) -# Shared data and Documents location. -aegisubdatadir="$datadir/$PACKAGE/aegisub_version_data" -AC_SUBST(aegisubdatadir) -aegisubdocdir="$datadir/doc/$PACKAGE/aegisub_version_data" -AC_SUBST(aegisubdocdir) # Name of aegisub binary. AEGISUB_COMMAND="aegisub-$AEGISUB_VERSION_MAJOR.$AEGISUB_VERSION_MINOR" AC_SUBST(AEGISUB_COMMAND) + # Handle location of desktop files: http://freedesktop.org/wiki/Specifications/desktop-entry-spec -AC_ARG_WITH(desktop-dir, [ --with-desktop-dir=PATH desktop file locations (default: PREFIX/share)]) +AC_ARG_WITH(desktop-dir, [ --with-desktop-dir=PATH desktop file locations + (default: PREFIX/share/applications)]) if ! test -z "$with_desktop_dir" ; then - DESKTOP_DATADIR=$with_desktop_dir + P_DESKTOP=$with_desktop_dir else - DESKTOP_DATADIR="$datadir" + P_DESKTOP="$datarootdir/applications" fi -AM_CONDITIONAL(DESKTOP_DATADIR, test "$with_desktop_dir" != "no") -AC_SUBST(DESKTOP_DATADIR) +AC_SUBST(P_DESKTOP) + + +# Handle location of icons: http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html +AC_ARG_WITH(icon-dir, [ --with-icon-dir=PATH icon locations (default: PREFIX/share/icons)]) +if ! test -z "$with_icon_dir" ; then + P_ICON=$with_icon_dir +else + P_ICON="$datarootdir/icons" +fi +AC_SUBST(P_ICON) # Install prefix @@ -197,8 +202,8 @@ AC_PROG_CC AC_PROG_CXX AC_LANG(C++) AM_PROG_CC_C_O +# This is reported to be required on Ubuntu, I haven't had time to check. define([AC_LIBTOOL_LANG_F77_CONFIG], [:]) -AC_PROG_LIBTOOL AC_PROG_INSTALL AC_PROG_RANLIB PKG_PROG_PKG_CONFIG([pkgconfig_required_version]) @@ -238,8 +243,8 @@ else PACKAGE_VERSION="${PACKAGE_VERSION}-dev-r${SVN_REVISION}" VERSION="${VERSION}-dev-r${SVN_REVISION}" - BUNDLE_STRING="Aegisub-${PACKAGE_VERSION}-dev-${SVN_REVISION}" - DMG_STRING="Aegisub-${PACKAGE_VERSION}-dev-${SVN_REVISION}-${arch_bundle}" + BUNDLE_STRING="Aegisub-${PACKAGE_VERSION}" + DMG_STRING="Aegisub-${PACKAGE_VERSION}-${arch_bundle}" fi @@ -324,21 +329,22 @@ AC_C_VOLATILE AC_CHECK_LIB([m], [main]) AC_CHECK_FUNC([strlcpy], [ - AC_DEFINE([HAVE_STRLCPY], [1], [strlcpy() exists in the c library.]) + AC_DEFINE([HAVE_STRLCPY], [1], [strlcpy() exists in the c library.]) ], []) -AC_LIBTOOL_DLOPEN_SELF -AC_MSG_CHECKING([[whether preprocessor supports #pragma once]]) -AC_PREPROC_IFELSE( - [AC_LANG_PROGRAM([[#pragma once]])], - [ - AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_PRAGMA_ONCE], [1], [Preprocessor support for #pragma once]) - ], -[AC_MSG_RESULT([no])]) +#AC_LIBTOOL_DLOPEN_SELF -AX_OPENMP([], [with_openmp="no"]) -AM_CONDITIONAL([HAVE_OPENMP], [test "$with_openmp" != "no"]) +AC_AGI_COMPILE([pragma once], [pragma_once], [], [],[ +#pragma once +int main(void) {} +]) + +if test "$agi_cv_pragma_once" = "no"; then + AC_MSG_FAILURE([Aegisub requires #pragma once to work correctly.]) +fi + +AX_OPENMP([with_openmp="yes"], [with_openmp="no"]) +AC_SUBST(with_openmp) AC_SUBST(OPENMP_CXXFLAGS) AC_CHECK_HEADERS([sys/time.h]) @@ -527,8 +533,7 @@ if test "$with_alsa" != "no"; then AC_DEFINE(WITH_ALSA, 1, [Enable ALSA Support]) found_audio_player="yes" fi - -AM_CONDITIONAL([HAVE_ALSA], [test "$with_alsa" != "no"]) +AC_SUBST(with_alsa) AC_SUBST(ALSA_LDFLAGS) @@ -562,7 +567,7 @@ if test "$agi_cv_with_portaudio" = "yes" && test "$with_portaudio" = "yes"; then found_audio_player="yes" fi -AM_CONDITIONAL([HAVE_PORTAUDIO], [test "$with_portaudio" != "no"]) +AC_SUBST(with_portaudio) ############# @@ -595,7 +600,7 @@ if test "$agi_cv_with_pulseaudio" = "yes" && test "$with_pulseaudio" = "yes"; th found_audio_player="yes" fi -AM_CONDITIONAL([HAVE_PULSEAUDIO], [test "$with_pulseaudio" != "no"]) +AC_SUBST(with_pulseaudio) ######### @@ -603,7 +608,14 @@ AM_CONDITIONAL([HAVE_PULSEAUDIO], [test "$with_pulseaudio" != "no"]) ######### AC_ARG_WITH(openal,[ --without-openal build without OpenAL audio provider. (default: auto)], openal_disabled="(disabled)") -if test "$with_openal" != "no"; then + +if test "$build_darwin" = "yes"; then + OPENAL_LIBS="-framework OpenAL" + OPENAL_CFLAGS="" + AC_SUBST(OPENAL_LIBS) + AC_SUBST(OPENAL_CFLAGS) + with_openal="yes" +elif test "$with_openal" != "no"; then PKG_CHECK_MODULES(OPENAL, openal >= 0.0.8, [with_openal=yes], [with_openal=no]) fi @@ -635,7 +647,7 @@ if test "$agi_cv_with_openal" = "yes" && test "$with_openal" = "yes"; then AC_DEFINE(WITH_OPENAL, 1, [Enable OpenAL support]) fi -AM_CONDITIONAL([HAVE_OPENAL], [test "$with_openal" != "no"]) +AC_SUBST(with_openal) ###### @@ -657,7 +669,7 @@ if test "$with_oss" != "no"; then AC_DEFINE(WITH_OSS, 1, [Enable OSS support]) fi -AM_CONDITIONAL([HAVE_OSS], [test "$with_oss" != "no"]) +AC_SUBST(with_oss) ######################### @@ -731,7 +743,7 @@ if test "$agi_cv_with_ffmpeg" = "no" || test "$with_ffmpeg" = "no"; then with_ffmpeg="no" fi -AM_CONDITIONAL([HAVE_FFMPEG], [test "$agi_cv_with_ffmpeg" = "yes"]) +AC_SUBST(agi_cv_with_ffmpeg) AC_SUBST(LIBAVFORMAT_LIBS) AC_SUBST(LIBAVFORMAT_CFLAGS) AC_SUBST(LIBAVCODEC_LIBS) @@ -772,7 +784,7 @@ else with_provider_ffmpegsource="no" fi -AM_CONDITIONAL([HAVE_PROVIDER_FFMPEGSOURCE], [test "$with_provider_ffmpegsource" = "yes"]) +AC_SUBST(with_provider_ffmpegsource) AC_SUBST(LIBPOSTPROC_LIBS) AC_SUBST(LIBPOSTPROC_CFLAGS) @@ -786,6 +798,8 @@ AC_ARG_WITH(external-libass, [ --with-external-libass link to external libass if test "$enable_libass" != "no"; then if test "$with_external_libass" != "yes"; then + with_external_libass="no" + if test "$agi_cv_with_iconv" = "yes"; then LIBASS_LIBS="-L../libass -lass_aegisub" LIBASS_CFLAGS="-I../libass" @@ -805,28 +819,12 @@ else with_libass="no" fi -AM_CONDITIONAL([WITH_LIBASS], [test "$with_libass" = "yes"]) -AM_CONDITIONAL([WITH_INTERNAL_LIBASS], [test "$with_libass" = "yes" && test "$with_external_libass" != "yes"]) +AC_SUBST(with_libass) +AC_SUBST(with_external_libass) AC_SUBST(LIBASS_LIBS) AC_SUBST(LIBASS_CFLAGS) - -AC_ARG_ENABLE(csri, [ --disable-csri disable CSRI (ASA) support (default=enabled)], csri_disabled="(disabled)") - -if test "$enable_csri" != "no"; then - PKG_CHECK_MODULES(CSRI, csri >= 0.1.0, with_csri="yes", with_csri="no") - PKG_CHECK_MODULES(ASA, asa >= 0.3.2, with_asa="yes", with_asa="no") - if test "$with_csri" = "yes" && test "$with_asa" = "yes"; then - AC_DEFINE(WITH_CSRI, 1, [Enable CSRI (ASA) Subtitle Provider]) - fi -else - with_csri="no" -fi - -AM_CONDITIONAL([WITH_CSRI], [test "$with_csri" = "yes"]) - - ########### ## Hunspell ########### @@ -853,7 +851,7 @@ if test "$agi_cv_with_hunspell" = "yes" && test "$with_hunspell" = "yes"; then AC_DEFINE(WITH_HUNSPELL, 1, [Enable Hunspell support.]) fi -AM_CONDITIONAL([HAVE_HUNSPELL], [test "$with_hunspell" != "no"]) +AC_SUBST(with_hunspell) @@ -894,14 +892,15 @@ fi LIBS="$aegisub_save_LIBS" if test "$agi_cv_with_lua" = "yes"; then - with_auto4="yes" with_automation="yes" + with_auto4_lua="yes" AC_DEFINE(WITH_AUTO4_LUA, 1, [Enable Automation (auto4), requires lua]) else - with_auto4="no" + with_automation="no" + with_auto4_lua="no" fi -AM_CONDITIONAL([HAVE_AUTO4_LUA], [test "$with_auto4" != "no"]) +AC_SUBST(with_auto4_lua) AC_SUBST(LUA_CFLAGS) AC_SUBST(LUA_LDFLAGS) @@ -909,7 +908,7 @@ AC_SUBST(LUA_LDFLAGS) if test "$with_automation" = "yes"; then AC_DEFINE(WITH_AUTOMATION, 1, [Enable Automation support, requires any automation language.]) fi -AM_CONDITIONAL([HAVE_AUTOMATION], [test "$with_automation" = "yes"]) +AC_SUBST(with_automation) @@ -972,7 +971,7 @@ if test "$enable_gcc_prec" = "yes"; then else AC_MSG_RESULT([no]) fi -AM_CONDITIONAL([PRECOMPILED_HEADER], [test "$enable_gcc_prec" = "yes"]) +AC_SUBST(enable_gcc_prec) ###################################################### @@ -1120,11 +1119,26 @@ if test "$enable_efence" = "yes" && test "$enable_ccmalloc" = "yes"; then fi +######## +# ccache +######## +AC_MSG_CHECKING([whether to enable ccache]) +AC_ARG_ENABLE(ccache, [ --enable-ccache enable ccache (default=no)]) +if test "$enable_ccache" = "yes"; then + AC_MSG_RESULT([yes]) +else + enable_ccache="no" + AC_MSG_RESULT([no]) +fi +AC_SUBST(enable_ccache) + + ############################## # Internationalisation support ############################## -AC_PROG_INTLTOOL -AM_GLIB_GNU_GETTEXT +# Avoid checking for config.rpath, we're not using automake. +define([AC_LIB_RPATH], [:]) +AM_GNU_GETTEXT([external]) if test "$build_darwin" = "yes"; then GETTEXT_PACKAGE="aegisub" @@ -1177,8 +1191,6 @@ if ! test -z "$with_provider_subtitle"; then else if test "$with_libass" = "yes"; then default_provider_subtitle="libass" - elif test "$with_csri" = "yes"; then - default_provider_subtitle="csri" fi fi AC_DEFINE_UNQUOTED([DEFAULT_PROVIDER_SUBTITLE], ["$default_provider_subtitle"], [Default Subtitle Provider.]) @@ -1225,32 +1237,15 @@ fi ############### # Misc settings ############### -AM_CONDITIONAL([FOUND_AUDIO_PLAYER], [test "$found_audio_player" = "yes"]) -AM_CONDITIONAL([FOUND_VIDEO_PROVIDER], [test "$found_video_provider" = "yes"]) - - -# Makefiles -AC_CONFIG_FILES([ -Makefile -automation/Makefile -desktop/Makefile -libaegisub/Makefile -libass/Makefile -libffms/Makefile -po/Makefile.in -reporter/Makefile -src/Makefile -src/bitmaps/Makefile -src/libresrc/Makefile -tools/Makefile -universalchardet/Makefile -tests/Makefile -]) +AC_SUBST(found_audio_player) +AC_SUBST(found_audio_provider) +AC_SUBST(found_video_provider) # Files that need substitution. AC_CONFIG_FILES([ desktop/aegisub.desktop tools/osx-bundle.sed +Makefile.inc ]) AC_OUTPUT @@ -1305,7 +1300,7 @@ Default Settings Audio Player: $default_player_audio Scripting Engines - auto4 Lua: $with_auto4 $lua51_disabled + auto4 Lua: $with_auto4_lua $lua51_disabled Audio Players ALSA: $with_alsa $alsa_disabled @@ -1322,7 +1317,6 @@ A/V Providers FFmpegSource: $with_provider_ffmpegsource $ffmpegsource_provider_disabled Subtitle Providers: - CSRI (ASA): $with_csri $csri_disabled $csri_default libASS $with_libass $libass_disabled $libass_default (both require iconv and fontconfig) diff --git a/aegisub/desktop/16x16/aegisub.png b/aegisub/desktop/16x16/apps/aegisub.png similarity index 100% rename from aegisub/desktop/16x16/aegisub.png rename to aegisub/desktop/16x16/apps/aegisub.png diff --git a/aegisub/desktop/22x22/aegisub.png b/aegisub/desktop/22x22/apps/aegisub.png similarity index 100% rename from aegisub/desktop/22x22/aegisub.png rename to aegisub/desktop/22x22/apps/aegisub.png diff --git a/aegisub/desktop/24x24/aegisub.png b/aegisub/desktop/24x24/apps/aegisub.png similarity index 100% rename from aegisub/desktop/24x24/aegisub.png rename to aegisub/desktop/24x24/apps/aegisub.png diff --git a/aegisub/desktop/32x32/aegisub.png b/aegisub/desktop/32x32/apps/aegisub.png similarity index 100% rename from aegisub/desktop/32x32/aegisub.png rename to aegisub/desktop/32x32/apps/aegisub.png diff --git a/aegisub/desktop/48x48/aegisub.png b/aegisub/desktop/48x48/apps/aegisub.png similarity index 100% rename from aegisub/desktop/48x48/aegisub.png rename to aegisub/desktop/48x48/apps/aegisub.png diff --git a/aegisub/desktop/64x64/aegisub.png b/aegisub/desktop/64x64/apps/aegisub.png similarity index 100% rename from aegisub/desktop/64x64/aegisub.png rename to aegisub/desktop/64x64/apps/aegisub.png diff --git a/aegisub/desktop/Makefile b/aegisub/desktop/Makefile new file mode 100644 index 000000000..d5f941ce2 --- /dev/null +++ b/aegisub/desktop/Makefile @@ -0,0 +1,51 @@ +include ../Makefile.inc + +applicationsdir = $(DESKTOP_DATADIR)/applications +applications_DATA = aegisub.desktop + +iconsscalabledir = $(DESKTOP_DATADIR)/icons/hicolor/scalable/apps +iconsscalable_DATA = scalable/aegisub.svg + + +all: ; + +ICON_HICOLOR = \ + 16x16/apps/aegisub.png \ + 22x22/apps/aegisub.png \ + 24x24/apps/aegisub.png \ + 32x32/apps/aegisub.png \ + 48x48/apps/aegisub.png \ + 64x64/apps/aegisub.png + +ICON_SCALABLE = \ + scalable/apps/aegisub.svg + +DESKTOP_FILE = \ + aegisub.desktop + +EXTRA_DIST = \ + aegisub.desktop.in \ + $(ICON_HICOLOR) \ + $(ICON_SCALABLE) + +install: install-desktop install-icons + +install-desktop: + @$(BIN_MKDIR) -p $(P_DESKTOP) + $(BIN_INSTALL) $(DESKTOP_FILE) $(P_DESKTOP)/$(DESKTOP_FILE) + + +install-icons: + @$(BIN_MKDIR) -p $(addprefix $(P_ICON)/hicolor/, $(dir $(ICON_HICOLOR))) + @for i in $(ICON_HICOLOR); do \ + $(BIN_ECHO) "$(BIN_INSTALL) $$i $(P_ICON)/hicolor/$$i"; \ + $(BIN_INSTALL) $$i $(P_ICON)/hicolor/$$i; \ + done + $(BIN_TOUCH) $(P_ICON)/hicolor + $(BIN_MKDIR) -p $(P_ICON)/hicolor/scalable/apps + $(BIN_CP) $(ICON_SCALABLE) $(P_ICON)/hicolor/$(ICON_SCALABLE) + + +CLEANFILES = aegisub.desktop + +include ../Makefile.target diff --git a/aegisub/desktop/Makefile.am b/aegisub/desktop/Makefile.am deleted file mode 100644 index 299daefd0..000000000 --- a/aegisub/desktop/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ - -if DESKTOP_DATADIR - -applicationsdir = $(DESKTOP_DATADIR)/applications -applications_DATA = aegisub.desktop - -iconsscalabledir = $(DESKTOP_DATADIR)/icons/hicolor/scalable/apps -iconsscalable_DATA = scalable/aegisub.svg - -install-data-hook: - touch "$(DESTDIR)$(DESKTOP_DATADIR)/icons/hicolor" - - -icons16dir = $(DESKTOP_DATADIR)/icons/hicolor/16x16/apps -icons16_DATA = 16x16/aegisub.png - -icons22dir = $(DESKTOP_DATADIR)/icons/hicolor/22x22/apps -icons22_DATA = 22x22/aegisub.png - -icons24dir = $(DESKTOP_DATADIR)/icons/hicolor/24x24/apps -icons24_DATA = 24x24/aegisub.png - -icons32dir = $(DESKTOP_DATADIR)/icons/hicolor/32x32/apps -icons32_DATA = 32x32/aegisub.png - -icons48dir = $(DESKTOP_DATADIR)/icons/hicolor/48x48/apps -icons48_DATA = 48x48/aegisub.png - -icons64dir = $(DESKTOP_DATADIR)/icons/hicolor/64x64/apps -icons64_DATA = 64x64/aegisub.png - -endif - - -EXTRA_DIST = \ - aegisub.desktop.in \ - 16x16/aegisub.png \ - 22x22/aegisub.png \ - 24x24/aegisub.png \ - 32x32/aegisub.png \ - 48x48/aegisub.png \ - 64x64/aegisub.png \ - scalable/aegisub.svg - -DISTCLEANFILES = aegisub.desktop diff --git a/aegisub/desktop/scalable/aegisub.svg b/aegisub/desktop/scalable/apps/aegisub.svg similarity index 100% rename from aegisub/desktop/scalable/aegisub.svg rename to aegisub/desktop/scalable/apps/aegisub.svg diff --git a/aegisub/install-sh b/aegisub/install-sh new file mode 100755 index 000000000..a5897de6e --- /dev/null +++ b/aegisub/install-sh @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2006-12-25.00 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. + +nl=' +' +IFS=" "" $nl" + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit=${DOITPROG-} +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chgrpcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog +rmcmd="$rmprog -f" +stripcmd= + +src= +dst= +dir_arg= +dst_arg= + +copy_on_change=false +no_target_directory= + +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" + shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; + + -o) chowncmd="$chownprog $2" + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + shift;; + + -T) no_target_directory=true;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; + esac + shift +done + +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +if test -z "$dir_arg"; then + trap '(exit $?); exit' 1 2 13 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dst_arg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? + fi + fi + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writeable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + -*) prefix='./';; + *) prefix='';; + esac + + eval "$initialize_posix_glob" + + oIFS=$IFS + IFS=/ + $posix_glob set -f + set fnord $dstdir + shift + $posix_glob set +f + IFS=$oIFS + + prefixes= + + for d + do + test -z "$d" && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi +done + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/aegisub/libaegisub/Makefile b/aegisub/libaegisub/Makefile new file mode 100644 index 000000000..80a465e5a --- /dev/null +++ b/aegisub/libaegisub/Makefile @@ -0,0 +1,47 @@ +# $Id$ +include ../Makefile.inc + + +LIB_SHARED = libaegisub-3.0.so +LIB_SHARED_INSTALL = yes +LIB_VERSION = 3 + +CXXFLAGS = -Iinclude -I../src -I.. -pedantic -DLAGI -fPIC + +PRECOMPILED_HEADER_NAME = lagi_pre.h +lagi_pre.h.gch: CXXFLAGS := $(CXXFLAGS) + +ifeq (yes, $(BUILD_DARWIN)) +CXXFLAGS += -I/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Headers/ +LDFLAGS += -L../universalchardet -luniversalchardet +endif + + +SRC = \ + common/charset.cpp \ + common/charset_conv.cpp \ + common/charset_ucd.cpp \ + common/mru.cpp \ + common/option.cpp \ + common/option_value.cpp \ + common/option_visit.cpp \ + common/log.cpp \ + common/validator.cpp \ + common/vfr.cpp \ + unix/util.cpp \ + unix/io.cpp \ + unix/access.cpp \ + unix/log.cpp + +ifeq (yes, $(BUILD_DARWIN)) +SRC += \ + osx/util.cpp +endif + +HEADERS = \ + */*.h \ + include/aegisub/*.h \ + include/aegisub/cajun/*.h + + +include ../Makefile.target diff --git a/aegisub/libaegisub/Makefile.am b/aegisub/libaegisub/Makefile.am deleted file mode 100644 index 4fbc910c8..000000000 --- a/aegisub/libaegisub/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -# $Id$ -AUTOMAKE_OPTIONS = subdir-objects -AM_CXXFLAGS= -DISTCLEANFILES= - -lib_LTLIBRARIES = libaegisub-3.0.la -libaegisub_3_0_la_CPPFLAGS = -I../src/include -Iinclude -I. @WX_CPPFLAGS@ -pedantic -DLAGI -AM_LDFLAGS = @ICONV_LDFLAGS@ - -if PRECOMPILED_HEADER -BUILT_SOURCES = lagi_pre.h.gch -AM_CXXFLAGS += -include lagi_pre.h -Winvalid-pch -fpch-deps -fpch-preprocess -nodist_libaegisub_3_0_la_SOURCES = lagi_pre.h.gch -endif - -if PRECOMPILED_HEADER -# This doesn't depend on Makefile on purpose, you should already know what you're doing when using this. -lagi_pre.h.gch: lagi_pre.h - @CXX@ $(libaegisub_3_0_la_CPPFLAGS) @CXXFLAGS@ @DEBUG_FLAGS@ -fPIC -DPIC lagi_pre.h -DISTCLEANFILES += lagi_pre.h.gch -endif - -if BUILD_DARWIN -AM_CXXFLAGS += -I/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Headers/ -AM_LDFLAGS += -L../universalchardet -luniversalchardet -endif - -libaegisub_3_0_la_SOURCES = \ - common/charset.cpp \ - common/charset_conv.cpp \ - common/charset_ucd.cpp \ - common/mru.cpp \ - common/option.cpp \ - common/option_value.cpp \ - common/option_visit.cpp \ - common/log.cpp \ - common/validator.cpp \ - common/vfr.cpp \ - unix/util.cpp \ - unix/io.cpp \ - unix/access.cpp \ - unix/log.cpp - -if BUILD_DARWIN -libaegisub_3_0_la_SOURCES += \ - osx/util.cpp -endif - -noinst_HEADERS = *.h - diff --git a/aegisub/libass/Makefile b/aegisub/libass/Makefile new file mode 100644 index 000000000..e2632f21d --- /dev/null +++ b/aegisub/libass/Makefile @@ -0,0 +1,23 @@ +include ../Makefile.inc + +CXXFLAGS += -DCONFIG_ICONV -DCONFIG_FONTCONFIG $(CFLAGS_FREETYPE) $(CFLAGS_ICONV) $(CFLAGS_FONTCONFIG) + +LIB = libass_aegisub.a + +SRC = \ + ass.c \ + ass_bitmap.c \ + ass_cache.c \ + ass_drawing.c \ + ass_font.c \ + ass_fontconfig.c \ + ass_library.c \ + ass_parse.c \ + ass_render.c \ + ass_render_api.c \ + ass_strtod.c \ + ass_utils.c + +HEADER = *.h + +include ../Makefile.target diff --git a/aegisub/libass/Makefile.am b/aegisub/libass/Makefile.am deleted file mode 100644 index a5705da1f..000000000 --- a/aegisub/libass/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -noinst_LIBRARIES = libass_aegisub.a - -AM_CPPFLAGS = @FREETYPE_CFLAGS@ -DCONFIG_ICONV -DCONFIG_FONTCONFIG @FONTCONFIG_CFLAGS@ @ICONV_CFLAGS@ - -if BUILD_DARWIN -AM_CPPFLAGS += -DBUILD_DARWIN -endif - -libass_aegisub_a_SOURCES = \ - ass.c \ - ass_bitmap.c \ - ass_cache.c \ - ass_drawing.c \ - ass_font.c \ - ass_fontconfig.c \ - ass_library.c \ - ass_parse.c \ - ass_render.c \ - ass_render_api.c \ - ass_strtod.c \ - ass_utils.c - -libass_aegisub_a_SOURCES += \ - *.h diff --git a/aegisub/libffms/Makefile.am b/aegisub/libffms/Makefile similarity index 53% rename from aegisub/libffms/Makefile.am rename to aegisub/libffms/Makefile index 0d3dc0646..35f69995d 100644 --- a/aegisub/libffms/Makefile.am +++ b/aegisub/libffms/Makefile @@ -1,11 +1,11 @@ -AUTOMAKE_OPTIONS = subdir-objects +include ../Makefile.inc -noinst_LIBRARIES = libffmpegsource_aegisub.a +CXXFLAGS = -Icore -Iinclude -D__UNIX__ -DFFMS_EXPORTS -DHAVE_STRLCPY -D__STDC_CONSTANT_MACROS +CXXFLAGS += $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC) -AM_CPPFLAGS = -Icore -Iinclude -D__UNIX__ -DFFMS_EXPORTS -DHAVE_STRLCPY -D__STDC_CONSTANT_MACROS @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@ +LIB = libffmpegsource_aegisub.a - -libffmpegsource_aegisub_a_SOURCES = \ +SRC = \ src/core/audiosource.cpp \ src/core/ffms.cpp \ src/core/indexing.cpp \ @@ -21,6 +21,11 @@ libffmpegsource_aegisub_a_SOURCES = \ src/core/videosource.cpp \ src/core/wave64writer.cpp -libffmpegsource_aegisub_a_SOURCES += \ +HEADER = \ src/core/*.h \ include/*.h + +include ../Makefile.target + + + diff --git a/aegisub/po/ChangeLog b/aegisub/po/ChangeLog deleted file mode 100644 index e69de29bb..000000000 diff --git a/aegisub/po/LINGUAS b/aegisub/po/LINGUAS deleted file mode 100644 index 5d10ad191..000000000 --- a/aegisub/po/LINGUAS +++ /dev/null @@ -1,17 +0,0 @@ -ca -cs -da -de -el -es -fi -fr_FR -hu -it -ja -ko -pt_BR -ru -vi -zh_CN -zh_TW diff --git a/aegisub/po/Makefile b/aegisub/po/Makefile new file mode 100644 index 000000000..74fed15d9 --- /dev/null +++ b/aegisub/po/Makefile @@ -0,0 +1,41 @@ +include ../Makefile.inc + +.SUFFIXES: .po .mo + +PO = \ + ca.po \ + cs.po \ + da.po \ + de.po \ + el.po \ + es.po \ + fi.po \ + fr_FR.po \ + hu.po \ + it.po \ + ja.po \ + ko.po \ + pt_BR.po \ + ru.po \ + vi.po \ + zh_CN.po \ + zh_TW.po + +MO = $(addsuffix .mo, $(basename $(PO))) + +all: $(MO) + +%.mo: %.po + $(BIN_MSGFMT) -o $@ $< + +install: + @$(BIN_MKDIR) -p $(addsuffix /LC_MESSAGES/, $(addprefix $(P_LOCALE)/, $(basename $(PO)))) + @for i in $(basename $(PO)); do \ + echo $(BIN_INSTALL) $$i.mo $(P_LOCALE)/$$i/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + $(BIN_INSTALL) $$i.mo $(P_LOCALE)/$$i/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + done + + +CLEANFILES = $(MO) + +include ../Makefile.target diff --git a/aegisub/po/Makevars b/aegisub/po/Makevars deleted file mode 100644 index 2a36d3f38..000000000 --- a/aegisub/po/Makevars +++ /dev/null @@ -1,11 +0,0 @@ -DOMAIN = aegisub - -subdir = po -top_builddir = .. - -XGETTEXT_OPTIONS = -C -k_ - -COPYRIGHT_HOLDER = Rodrigo Braz Monteiro -MSGID_BUGS_ADDRESS = -EXTRA_LOCALE_CATEGORIES = - diff --git a/aegisub/po/POTFILES.in b/aegisub/po/POTFILES.in deleted file mode 100644 index 0619dfd5b..000000000 --- a/aegisub/po/POTFILES.in +++ /dev/null @@ -1,505 +0,0 @@ -MatroskaParser.h -VideoSink.cpp -VideoSink.cpp -VideoSink.h -aegisub_endian.h -aegisublocale.cpp -aegisublocale.cpp -aegisublocale.h -agi_pre.cpp -agi_pre.cpp -agi_pre.h -ass_attachment.cpp -ass_attachment.cpp -ass_attachment.h -ass_dialogue.cpp -ass_dialogue.cpp -ass_dialogue.h -ass_entry.cpp -ass_entry.cpp -ass_entry.h -ass_export_filter.cpp -ass_export_filter.cpp -ass_export_filter.h -ass_exporter.cpp -ass_exporter.cpp -ass_exporter.h -ass_file.cpp -ass_file.cpp -ass_file.h -ass_karaoke.cpp -ass_karaoke.cpp -ass_karaoke.h -ass_override.cpp -ass_override.cpp -ass_override.h -ass_style.cpp -ass_style.cpp -ass_style.h -ass_style_storage.cpp -ass_style_storage.cpp -ass_style_storage.h -ass_time.cpp -ass_time.cpp -ass_time.h -audio_box.cpp -audio_box.cpp -audio_box.h -audio_display.cpp -audio_display.cpp -audio_display.h -audio_karaoke.cpp -audio_karaoke.cpp -audio_karaoke.h -audio_player.cpp -audio_player.cpp -audio_player_alsa.cpp -audio_player_alsa.cpp -audio_player_alsa.h -audio_player_dsound.cpp -audio_player_dsound.cpp -audio_player_dsound.h -audio_player_dsound2.cpp -audio_player_dsound2.h -audio_player_manager.h -audio_player_openal.cpp -audio_player_openal.cpp -audio_player_openal.h -audio_player_portaudio.cpp -audio_player_portaudio.cpp -audio_player_portaudio.h -audio_player_pulse.cpp -audio_player_pulse.cpp -audio_player_pulse.h -audio_provider.cpp -audio_provider.cpp -audio_provider_avs.cpp -audio_provider_avs.cpp -audio_provider_avs.h -audio_provider_convert.cpp -audio_provider_convert.h -audio_provider_downmix.cpp -audio_provider_downmix.h -audio_provider_dummy.cpp -audio_provider_dummy.h -audio_provider_ffmpegsource.cpp -audio_provider_ffmpegsource.h -audio_provider_hd.cpp -audio_provider_hd.cpp -audio_provider_hd.h -audio_provider_lavc.cpp -audio_provider_lavc.cpp -audio_provider_lavc.h -audio_provider_manager.h -audio_provider_pcm.cpp -audio_provider_pcm.h -audio_provider_ram.cpp -audio_provider_ram.cpp -audio_provider_ram.h -audio_provider_stream.cpp -audio_provider_stream.cpp -audio_provider_stream.h -audio_spectrum.cpp -audio_spectrum.cpp -audio_spectrum.h -auto4_auto3.cpp -auto4_auto3.cpp -auto4_auto3.h -auto4_auto3_factory.h -auto4_base.cpp -auto4_base.cpp -auto4_base.h -auto4_lua.cpp -auto4_lua.cpp -auto4_lua.h -auto4_lua_assfile.cpp -auto4_lua_assfile.cpp -auto4_lua_dialog.cpp -auto4_lua_dialog.cpp -auto4_lua_factory.h -auto4_lua_scriptreader.cpp -auto4_lua_scriptreader.cpp -auto4_lua_scriptreader.h -auto4_perl.cpp -auto4_perl.h -auto4_perl_ass.cpp -auto4_perl_console.cpp -auto4_perl_console.h -auto4_perl_dialogs.cpp -auto4_perl_factory.h -auto4_perl_script.cpp -auto4_ruby.cpp -auto4_ruby.cpp -auto4_ruby.h -auto4_ruby_assfile.cpp -auto4_ruby_assfile.cpp -auto4_ruby_dialog.cpp -auto4_ruby_dialog.cpp -auto4_ruby_factory.h -avisynth.h -avisynth_wrap.cpp -avisynth_wrap.cpp -avisynth_wrap.h -base_grid.cpp -base_grid.cpp -base_grid.h -browse_button.cpp -browse_button.cpp -browse_button.h -charset_detect.cpp -charset_detect.cpp -charset_detect.h -colorspace.cpp -colorspace.cpp -colorspace.h -colour_button.cpp -colour_button.cpp -colour_button.h -dialog_about.cpp -dialog_about.cpp -dialog_about.h -dialog_associations.cpp -dialog_associations.cpp -dialog_associations.h -dialog_attachments.cpp -dialog_attachments.cpp -dialog_attachments.h -dialog_automation.cpp -dialog_automation.cpp -dialog_automation.h -dialog_colorpicker.cpp -dialog_colorpicker.cpp -dialog_colorpicker.h -dialog_detached_video.cpp -dialog_detached_video.cpp -dialog_detached_video.h -dialog_dummy_video.cpp -dialog_dummy_video.cpp -dialog_dummy_video.h -dialog_export.cpp -dialog_export.cpp -dialog_export.h -dialog_fonts_collector.cpp -dialog_fonts_collector.cpp -dialog_fonts_collector.h -dialog_jumpto.cpp -dialog_jumpto.cpp -dialog_jumpto.h -dialog_kanji_timer.cpp -dialog_kanji_timer.cpp -dialog_kanji_timer.h -dialog_options.cpp -dialog_options.cpp -dialog_options.h -dialog_paste_over.cpp -dialog_paste_over.cpp -dialog_paste_over.h -dialog_progress.cpp -dialog_progress.cpp -dialog_progress.h -dialog_properties.cpp -dialog_properties.cpp -dialog_properties.h -dialog_resample.cpp -dialog_resample.cpp -dialog_resample.h -dialog_search_replace.cpp -dialog_search_replace.cpp -dialog_search_replace.h -dialog_selection.cpp -dialog_selection.cpp -dialog_selection.h -dialog_shift_times.cpp -dialog_shift_times.cpp -dialog_shift_times.h -dialog_spellchecker.cpp -dialog_spellchecker.cpp -dialog_spellchecker.h -dialog_splash.cpp -dialog_splash.cpp -dialog_splash.h -dialog_style_editor.cpp -dialog_style_editor.cpp -dialog_style_editor.h -dialog_style_manager.cpp -dialog_style_manager.cpp -dialog_style_manager.h -dialog_styling_assistant.cpp -dialog_styling_assistant.cpp -dialog_styling_assistant.h -dialog_text_import.cpp -dialog_text_import.h -dialog_timing_processor.cpp -dialog_timing_processor.cpp -dialog_timing_processor.h -dialog_tip.cpp -dialog_tip.cpp -dialog_tip.h -dialog_translation.cpp -dialog_translation.cpp -dialog_translation.h -dialog_version_check.cpp -dialog_version_check.cpp -dialog_version_check.h -dialog_video_details.cpp -dialog_video_details.h -drop.cpp -drop.cpp -drop.h -export_clean_info.cpp -export_clean_info.cpp -export_clean_info.h -export_fixstyle.cpp -export_fixstyle.cpp -export_fixstyle.h -export_framerate.cpp -export_framerate.cpp -export_framerate.h -export_visible_lines.cpp -export_visible_lines.cpp -export_visible_lines.h -factory_manager.h -ffmpegsource_common.cpp -ffmpegsource_common.h -fft.cpp -fft.cpp -fft.h -float_spin.cpp -float_spin.cpp -float_spin.h -font_file_lister.cpp -font_file_lister.cpp -font_file_lister.h -font_file_lister_fontconfig.cpp -font_file_lister_fontconfig.h -font_file_lister_freetype.cpp -font_file_lister_freetype.h -frame_main.cpp -frame_main.cpp -frame_main.h -frame_main_events.cpp -frame_main_events.cpp -gl/glext.h -gl_text.cpp -gl_text.cpp -gl_text.h -gl_wrap.cpp -gl_wrap.cpp -gl_wrap.h -help_button.cpp -help_button.h -hilimod_textctrl.cpp -hilimod_textctrl.cpp -hilimod_textctrl.h -hotkeys.cpp -hotkeys.cpp -hotkeys.h -idle_field_event.cpp -idle_field_event.cpp -idle_field_event.h -include/aegisub/aegisub.h -include/aegisub/audio_player.h -include/aegisub/audio_provider.h -include/aegisub/spellchecker.h -include/aegisub/subtitles_provider.h -include/aegisub/video_provider.h -kana_table.cpp -kana_table.cpp -kana_table.h -keyframe.cpp -keyframe.h -lavc_file.cpp -lavc_file.cpp -lavc_file.h -lavc_keyframes.cpp -lavc_keyframes.h -main.cpp -main.cpp -main.h -md5.h -mkv_wrap.cpp -mkv_wrap.cpp -mkv_wrap.h -options.cpp -options.cpp -options.h -osx_bevelButton.cpp -osx_bevelButton.h -plugin_manager.cpp -plugin_manager.h -scintilla_text_ctrl.cpp -scintilla_text_ctrl.cpp -scintilla_text_ctrl.h -setup.cpp -setup.cpp -spellchecker.cpp -spellchecker.cpp -spellchecker_hunspell.cpp -spellchecker_hunspell.cpp -spellchecker_hunspell.h -spellchecker_manager.h -spline.cpp -spline.h -spline_curve.cpp -spline_curve.h -standard_paths.cpp -standard_paths.cpp -standard_paths.h -static_bmp.cpp -static_bmp.cpp -static_bmp.h -string_codec.cpp -string_codec.cpp -string_codec.h -subs_edit_box.cpp -subs_edit_box.cpp -subs_edit_box.h -subs_edit_ctrl.cpp -subs_edit_ctrl.cpp -subs_edit_ctrl.h -subs_grid.cpp -subs_grid.cpp -subs_grid.h -subs_preview.cpp -subs_preview.cpp -subs_preview.h -subtitle_format.cpp -subtitle_format.cpp -subtitle_format.h -subtitle_format_ass.cpp -subtitle_format_ass.cpp -subtitle_format_ass.h -subtitle_format_dvd.cpp -subtitle_format_dvd.h -subtitle_format_encore.cpp -subtitle_format_encore.cpp -subtitle_format_encore.h -subtitle_format_microdvd.cpp -subtitle_format_microdvd.cpp -subtitle_format_microdvd.h -subtitle_format_mkv.cpp -subtitle_format_mkv.cpp -subtitle_format_mkv.h -subtitle_format_prs.cpp -subtitle_format_prs.cpp -subtitle_format_prs.h -subtitle_format_srt.cpp -subtitle_format_srt.cpp -subtitle_format_srt.h -subtitle_format_transtation.cpp -subtitle_format_transtation.h -subtitle_format_ttxt.cpp -subtitle_format_ttxt.cpp -subtitle_format_ttxt.h -subtitle_format_txt.cpp -subtitle_format_txt.cpp -subtitle_format_txt.h -subtitles_provider.cpp -subtitles_provider.cpp -subtitles_provider_csri.cpp -subtitles_provider_csri.cpp -subtitles_provider_csri.h -subtitles_provider_libass.cpp -subtitles_provider_libass.cpp -subtitles_provider_libass.h -subtitles_provider_manager.h -text_file_reader.cpp -text_file_reader.cpp -text_file_reader.h -text_file_writer.cpp -text_file_writer.cpp -text_file_writer.h -thesaurus.cpp -thesaurus.cpp -thesaurus.h -thesaurus_myspell.cpp -thesaurus_myspell.cpp -thesaurus_myspell.h -timeedit_ctrl.cpp -timeedit_ctrl.cpp -timeedit_ctrl.h -toggle_bitmap.cpp -toggle_bitmap.cpp -toggle_bitmap.h -tooltip_manager.cpp -tooltip_manager.cpp -tooltip_manager.h -utils.cpp -utils.cpp -utils.h -validators.cpp -validators.cpp -validators.h -variable_data.cpp -variable_data.cpp -variable_data.h -vector2d.cpp -vector2d.h -version.cpp -version.cpp -version.h -vfr.cpp -vfr.cpp -vfr.h -vfw_wrap.cpp -vfw_wrap.cpp -vfw_wrap.h -video_box.cpp -video_box.cpp -video_box.h -video_context.cpp -video_context.cpp -video_context.h -video_display.cpp -video_display.cpp -video_display.h -video_frame.cpp -video_frame.cpp -video_frame.h -video_provider_avs.cpp -video_provider_avs.cpp -video_provider_avs.h -video_provider_cache.cpp -video_provider_cache.h -video_provider_dshow.cpp -video_provider_dshow.cpp -video_provider_dshow.h -video_provider_dummy.cpp -video_provider_dummy.cpp -video_provider_dummy.h -video_provider_ffmpegsource.cpp -video_provider_ffmpegsource.h -video_provider_lavc.cpp -video_provider_lavc.cpp -video_provider_lavc.h -video_provider_manager.cpp -video_provider_manager.h -video_slider.cpp -video_slider.cpp -video_slider.h -visual_feature.cpp -visual_feature.cpp -visual_feature.h -visual_tool.cpp -visual_tool.cpp -visual_tool.h -visual_tool_clip.cpp -visual_tool_clip.cpp -visual_tool_clip.h -visual_tool_cross.cpp -visual_tool_cross.cpp -visual_tool_cross.h -visual_tool_drag.cpp -visual_tool_drag.cpp -visual_tool_drag.h -visual_tool_rotatexy.cpp -visual_tool_rotatexy.cpp -visual_tool_rotatexy.h -visual_tool_rotatez.cpp -visual_tool_rotatez.cpp -visual_tool_rotatez.h -visual_tool_scale.cpp -visual_tool_scale.cpp -visual_tool_scale.h -visual_tool_vector_clip.cpp -visual_tool_vector_clip.h diff --git a/aegisub/po/read me JP.txt b/aegisub/po/README_ja.txt similarity index 94% rename from aegisub/po/read me JP.txt rename to aegisub/po/README_ja.txt index 08c19fbed..1ba934f7f 100644 --- a/aegisub/po/read me JP.txt +++ b/aegisub/po/README_ja.txt @@ -1,190 +1,190 @@ -■Aegisub 2.1.6(SVN r2496)日本語言語ファイル Ver0.25 - -本体のコンパイルとかよくわかんない。 -「wxstd.mo」ほぼすべて日本語化完了。 -「aegisub.mo」現在96％ほど日本語化した。 -※1237行中48行は未翻訳 - -翻訳の間違いやヘンなところがありましたら、お気軽にメールください。 -博：h-h23@edogawa.home.ne.jp - - -■Aegisub 使用上の注意！ - -字幕ファイルの関連付けですが、私のPCでは関連付けすると解除が上手くいきません。 -ASSファイルの沢山入ったフォルダを開くと、目玉アイコンがイッパイで… -見た目が怖いです。 - -目玉アイコンが気持ち悪いと感じる人は、 -本体のバグが直るまで字幕の関連付けは避けた方が良いでしょう。 - - -■日本語化 - -「aegisub.mo」と「wxstd.mo」の入った「ja」フォルダを、 -Aegisubインストールフォルダ内の「locale」フォルダに入れてください。 - -デフォルトでは、 -C:\Program Files\Aegisub\locale -です。 - -Aegisubのメニュー「Language」を選択、 -Languageウィンドウに「Japanese」が現れるので指定してOKを押してください。 - -「Restart Aegisub?」と書かれたダイアログが表示されます。 - -「Aegisub needs to be restarted so that the new language can be applied. Restart now?」 -　↑翻訳↓ -「新たな言語を適用するにはAegisubを再起動する必要があります、Aegisubを再起動しますか？」 - -「はい」を押せばAegisubが再起動して日本語ユーザーインターフェースに替わります。 - - -■簡単な言語ファイルの仕組み - -「aegisub.po」と「aegisub.mo」：Aegisub固有の言語ファイル。 - -「wxstd.po」と「wxstd.mo」：ソフト動作基本の言語ファイル（他のソフトと共用可能）。 - -「*.po」はソース記述の言語ファイル。 -「*.mo」はコンパイル済みの言語ファイル。 - -poEdit -http://www.google.co.jp/search?hl=ja&q=poedit&btnG=Google+%E6%A4%9C%E7%B4%A2&lr=lang_ja -ってソフトで同梱の「aegisub.po」と「wxstd.po」を開くとイジれる、 -保存すると「aegisub.mo」と「wxstd.mo」を自動生成して保存してくれる。 - -イジるだけならUTF-8に対応してるテキストエディタで「*.po」ファイルを書き換え、 -poEditで読み込み、保存すればOK！ - -※wxstd.moが優先されるので、wxstd.moの的確でない翻訳部分はわざと空白にしています。 -※テキストエディタ：フリーのTeraPadや有料の秀丸など - - - -■翻訳環境 - -WindowsXP Pro SP3 - - -■更新履歴 - - -▼「aegisub.mo」 - -●2009/01/08 -Hiroshi更新 - -●2008/12/04 -Hiroshi更新 - -●2008/08/31 -Hiroshi更新 - -●2008/08/17 -Hiroshi更新 - -●2008/08/16 -Hiroshi更新 - -●2008/08/05 -Hiroshi、新たなSVNサーバーからソース取得後にaegisub.potにてカタログファイル更新 - -●2008/07/31 -Hiroshi更新 - -●2008/07/31 -Hiroshi更新分と准643更新分をマージ - -●2008/07/30 -准643更新 - -●2008/07/30 -Hiroshi更新 - -●2008/07/29 -Hiroshi更新 - -●2008/07/28 -Hiroshi更新 - -●2008/07/27 -Hiroshi更新 - -●2008/07/27 -Hiroshi更新 - -●2008/07/26 -Hiroshi更新分とElec更新分をマージ - -●2008/07/25 -Elec更新 - -●2008/07/23 -Hiroshi更新 - -●2008/07/23 -Hiroshi更新 - -●2008/07/22 -Hiroshi更新 - -●2008/07/21 -Hiroshi更新 - -●2008/07/20 -Hiroshi更新 - -●2008/07/15 -Hiroshi更新 - -●2007/06/07 -Hibiki更新 - -●2007/05/13 -Hiroshi作成 - - -▼「wxstd.mo」 - -●2007/07/23 -Hiroshi更新 - -●2008/07/20 -鈴見咲君高さんのソースを参考にほぼ完了、Hiroshi更新 - -●2007/05/13 -Hiroshi作成 - - - - -Hiroshi Haga -mail：h-h23@edogawa.home.ne.jp -WEB：http://g-mark.jpn.org/ - -Hibiki -mail：hibikiotemae@gmail.com - -Elec -mail： -WEB： - -准643 -mail： -WEB：http://www13.atwiki.jp/cc/ - - - - -■ローカライズ用カタログファイルの作成 - -Subversion管理用ツールを用いる。 -お薦めは「TortoiseSVN」 -http://tortoisesvn.net/ - -AegisubのSVNサーバーからチェックアウト - -poEditを起動して、 -「ファイル」→「POT ファイルを元に新しいカタログを作成します」 -でSVNサーバーから落とした「po」フォルダ内の「aegisub.pot」でカタログ作成。 +■Aegisub 2.1.6(SVN r2496)日本語言語ファイル Ver0.25 + +本体のコンパイルとかよくわかんない。 +「wxstd.mo」ほぼすべて日本語化完了。 +「aegisub.mo」現在96％ほど日本語化した。 +※1237行中48行は未翻訳 + +翻訳の間違いやヘンなところがありましたら、お気軽にメールください。 +博：h-h23@edogawa.home.ne.jp + + +■Aegisub 使用上の注意！ + +字幕ファイルの関連付けですが、私のPCでは関連付けすると解除が上手くいきません。 +ASSファイルの沢山入ったフォルダを開くと、目玉アイコンがイッパイで… +見た目が怖いです。 + +目玉アイコンが気持ち悪いと感じる人は、 +本体のバグが直るまで字幕の関連付けは避けた方が良いでしょう。 + + +■日本語化 + +「aegisub.mo」と「wxstd.mo」の入った「ja」フォルダを、 +Aegisubインストールフォルダ内の「locale」フォルダに入れてください。 + +デフォルトでは、 +C:\Program Files\Aegisub\locale +です。 + +Aegisubのメニュー「Language」を選択、 +Languageウィンドウに「Japanese」が現れるので指定してOKを押してください。 + +「Restart Aegisub?」と書かれたダイアログが表示されます。 + +「Aegisub needs to be restarted so that the new language can be applied. Restart now?」 +　↑翻訳↓ +「新たな言語を適用するにはAegisubを再起動する必要があります、Aegisubを再起動しますか？」 + +「はい」を押せばAegisubが再起動して日本語ユーザーインターフェースに替わります。 + + +■簡単な言語ファイルの仕組み + +「aegisub.po」と「aegisub.mo」：Aegisub固有の言語ファイル。 + +「wxstd.po」と「wxstd.mo」：ソフト動作基本の言語ファイル（他のソフトと共用可能）。 + +「*.po」はソース記述の言語ファイル。 +「*.mo」はコンパイル済みの言語ファイル。 + +poEdit +http://www.google.co.jp/search?hl=ja&q=poedit&btnG=Google+%E6%A4%9C%E7%B4%A2&lr=lang_ja +ってソフトで同梱の「aegisub.po」と「wxstd.po」を開くとイジれる、 +保存すると「aegisub.mo」と「wxstd.mo」を自動生成して保存してくれる。 + +イジるだけならUTF-8に対応してるテキストエディタで「*.po」ファイルを書き換え、 +poEditで読み込み、保存すればOK！ + +※wxstd.moが優先されるので、wxstd.moの的確でない翻訳部分はわざと空白にしています。 +※テキストエディタ：フリーのTeraPadや有料の秀丸など + + + +■翻訳環境 + +WindowsXP Pro SP3 + + +■更新履歴 + + +▼「aegisub.mo」 + +●2009/01/08 +Hiroshi更新 + +●2008/12/04 +Hiroshi更新 + +●2008/08/31 +Hiroshi更新 + +●2008/08/17 +Hiroshi更新 + +●2008/08/16 +Hiroshi更新 + +●2008/08/05 +Hiroshi、新たなSVNサーバーからソース取得後にaegisub.potにてカタログファイル更新 + +●2008/07/31 +Hiroshi更新 + +●2008/07/31 +Hiroshi更新分と准643更新分をマージ + +●2008/07/30 +准643更新 + +●2008/07/30 +Hiroshi更新 + +●2008/07/29 +Hiroshi更新 + +●2008/07/28 +Hiroshi更新 + +●2008/07/27 +Hiroshi更新 + +●2008/07/27 +Hiroshi更新 + +●2008/07/26 +Hiroshi更新分とElec更新分をマージ + +●2008/07/25 +Elec更新 + +●2008/07/23 +Hiroshi更新 + +●2008/07/23 +Hiroshi更新 + +●2008/07/22 +Hiroshi更新 + +●2008/07/21 +Hiroshi更新 + +●2008/07/20 +Hiroshi更新 + +●2008/07/15 +Hiroshi更新 + +●2007/06/07 +Hibiki更新 + +●2007/05/13 +Hiroshi作成 + + +▼「wxstd.mo」 + +●2007/07/23 +Hiroshi更新 + +●2008/07/20 +鈴見咲君高さんのソースを参考にほぼ完了、Hiroshi更新 + +●2007/05/13 +Hiroshi作成 + + + + +Hiroshi Haga +mail：h-h23@edogawa.home.ne.jp +WEB：http://g-mark.jpn.org/ + +Hibiki +mail：hibikiotemae@gmail.com + +Elec +mail： +WEB： + +准643 +mail： +WEB：http://www13.atwiki.jp/cc/ + + + + +■ローカライズ用カタログファイルの作成 + +Subversion管理用ツールを用いる。 +お薦めは「TortoiseSVN」 +http://tortoisesvn.net/ + +AegisubのSVNサーバーからチェックアウト + +poEditを起動して、 +「ファイル」→「POT ファイルを元に新しいカタログを作成します」 +でSVNサーバーから落とした「po」フォルダ内の「aegisub.pot」でカタログ作成。 diff --git a/aegisub/po/make_pot.bat b/aegisub/po/make_pot.bat deleted file mode 100644 index 6bf402791..000000000 --- a/aegisub/po/make_pot.bat +++ /dev/null @@ -1,4 +0,0 @@ -del /s list.txt -dir /w /b ..\aegisub\*.cpp ..\aegisub\*.h >> list.txt -"C:\Program Files (x86)\GnuWin32\bin\xgettext.exe" --files-from=list.txt --directory=../aegisub/ --output=aegisub.pot --c++ -k_ -pause \ No newline at end of file diff --git a/aegisub/po/mkwin32layout.py b/aegisub/po/mkwin32layout.py deleted file mode 100644 index 40197815e..000000000 --- a/aegisub/po/mkwin32layout.py +++ /dev/null @@ -1,19 +0,0 @@ - -import shutil -import os - -destpath = "../locale" -os.mkdir(destpath) - -for lang in file("LINGUAS").readlines(): - lang = lang.strip() - langpath = destpath + "/" + lang - os.mkdir(langpath) - shutil.copyfile(lang + ".po", langpath + "/aegisub.po") - if os.access("wxstd-" + lang + ".mo", os.R_OK): - shutil.copyfile("wxstd-" + lang + ".mo", langpath + "/wxstd.mo") - if os.access(lang + ".gmo", os.R_OK): - shutil.copyfile(lang + ".gmo", langpath + "/aegisub.mo") - else: - shutil.copyfile(lang + ".mo", langpath + "/aegisub.mo") - diff --git a/aegisub/reporter/Makefile b/aegisub/reporter/Makefile new file mode 100644 index 000000000..76841d2b8 --- /dev/null +++ b/aegisub/reporter/Makefile @@ -0,0 +1,57 @@ +include ../Makefile.inc + +PROGRAM = reporter-3.0 +PROGRAM_INSTALL = yes +PRECOMPILED_HEADER_NAME=r_pre.h + + +#if PRECOMPILED_HEADER +#BUILT_SOURCES = r_pre.h.gch +#AM_CXXFLAGS += -include r_pre.h -Winvalid-pch -fpch-deps -fpch-preprocess +#nodist_reporter_3_0_SOURCES = r_prec.h.gch +#endif + +CXXFLAGS += -Iinclude $(CFLAGS_WX) +LDFLAGS += $(LDFLAGS_WX) $(LDFLAGS_LIBCURL) + +#if PRECOMPILED_HEADER +## This doesn't depend on Makefile on purpose, you should already know what you're doing when using this. +#r_pre.h.gch: r_pre.h +# @CXX@ @WX_CPPFLAGS@ @CXXFLAGS@ @DEBUG_FLAGS@ r_pre.h +#DISTCLEANFILES += r_pre.h.gch +#endif + + +# File-specific flags +upload.o: CXXFLAGS += $(CFLAGS_CURL) + +SRC = \ + aegisub.cpp \ + main.cpp \ + name_map.cpp \ + platform.cpp \ + platform_unix.cpp \ + progress.cpp \ + report.cpp \ + upload.cpp \ + view.cpp + + +ifeq (yes, $(BUILD_BSD)) +SRC += platform_unix_bsd.cpp +endif + +ifeq (yes, $(BUILD_LINUX)) +SRC += platform_unix_linux.cpp +endif + +ifeq (yes, $(BUILD_DARWIN)) +SRC += platform_unix_osx.cpp +endif + + +HEADER = \ + *.h \ + include/*.h + +include ../Makefile.target diff --git a/aegisub/reporter/Makefile.am b/aegisub/reporter/Makefile.am deleted file mode 100644 index ad7d1ae53..000000000 --- a/aegisub/reporter/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -AUTOMAKE_OPTIONS = foreign -AM_CXXFLAGS = -DISTCLEANFILES = - -bin_PROGRAMS = reporter-3.0 - -if PRECOMPILED_HEADER -BUILT_SOURCES = r_pre.h.gch -AM_CXXFLAGS += -include r_pre.h -Winvalid-pch -fpch-deps -fpch-preprocess -nodist_reporter_3_0_SOURCES = r_prec.h.gch -endif - -reporter_3_0_CPPFLAGS = -Iinclude @LIBCURL_CFLAGS@ @WX_CPPFLAGS@ -reporter_3_0_LDFLAGS = @WX_LIBS@ @LIBCURL_LIBS@ - -if PRECOMPILED_HEADER -# This doesn't depend on Makefile on purpose, you should already know what you're doing when using this. -r_pre.h.gch: r_pre.h - @CXX@ @WX_CPPFLAGS@ @CXXFLAGS@ @DEBUG_FLAGS@ r_pre.h -DISTCLEANFILES += r_pre.h.gch -endif - - -reporter_3_0_SOURCES = \ - aegisub.cpp \ - main.cpp \ - name_map.cpp \ - platform.cpp \ - platform_unix.cpp \ - progress.cpp \ - report.cpp \ - upload.cpp \ - view.cpp - -if BUILD_BSD -reporter_3_0_SOURCES += platform_unix_bsd.cpp -endif - -if BUILD_LINUX -reporter_3_0_SOURCES += platform_unix_linux.cpp -endif - -if BUILD_DARWIN -reporter_3_0_SOURCES += platform_unix_osx.cpp -endif - - -reporter_3_0_SOURCES += \ - *.h \ - include/*.h - diff --git a/aegisub/src/Makefile b/aegisub/src/Makefile new file mode 100644 index 000000000..70b570490 --- /dev/null +++ b/aegisub/src/Makefile @@ -0,0 +1,274 @@ +include ../Makefile.inc + +PROGRAM = aegisub-3.0 +PROGRAM_INSTALL = yes + +PRECOMPILED_HEADER_NAME=agi_pre.h + +SUBDIRS = libresrc + +CXXFLAGS += -DAEGISUB -D__STDC_FORMAT_MACROS -I. -I.. -Iinclude -I../libaegisub/include $(CPPFLAGS_WX) + +LDFLAGS += -L../libaegisub -laegisub-3.0 +LDFLAGS += $(CFLAGS_DEBUG) $(CFLAGS_PROFILE) $(LDFLAGS_CCMALLOC) $(LDFLAGS_EFENCE) +LDFLAGS += $(LDFLAGS_GL) $(LDFLAGS_PTHREAD) $(LDFLAGS_WX) $(LDFLAGS_FREETYPE) $(LDFLAGS_FONTCONFIG) +LDFLAGS_POST += libresrc/libresrc.a $(LDFLAGS_UCHARDET) + +ifdef BUILD_DARWIN +LDFLAGS += -lz +endif + + +############### +# AUDIO PLAYERS +############### + +ifeq (yes, $(HAVE_ALSA)) +SRC_OPT += audio_player_alsa.cpp +audio_player_alsa.o: CXXFLAGS += $(CFLAGS_ALSA) +LDFLAGS += $(LDFLAGS_ALSA) +endif + +ifeq (yes, $(HAVE_PORTAUDIO)) +SRC_OPT += audio_player_portaudio.cpp +audio_player_portaudio.o: CXXFLAGS += $(CFLAGS_PORTAUDIO) +LDFLAGS += $(LDFLAGS_PORTAUDIO) +endif + +ifeq (yes, $(HAVE_PULSEAUDIO)) +SRC_OPT += audio_player_pulse.cpp +audio_player_pulse.o: CXXFLAGS += $(CFLAGS_LIBPULSE) +LDFLAGS += $(LDFLAGS_LIBPULSE) +endif + +ifeq (yes, $(HAVE_OPENAL)) +SRC_OPT += audio_player_openal.cpp +audio_player_openal.o: CXXFLAGS += $(CFLAGS_OPENAL) +LDFLAGS += $(LDFLAGS_OPENAL) +endif + +ifeq (yes, $(HAVE_OSS)) +SRC_OPT += audio_player_oss.cpp +endif + + +####################### +# AUDIO / VIDEO SUPPORT +####################### +ifeq (yes, $(HAVE_PROVIDER_FFMPEGSOURCE)) +SRC_OPT += audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp +audio_provider_ffmpegsource.o video_provider_ffmpegsource.o ffmpegsource_common.o: \ + CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBSWSCALE) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC) +LDFLAGS += $(LDFLAGS_FFMPEGSOURCE) $(LDFLAGS_LIBAVFORMAT) $(LDFLAGS_LIBAVCODEC) $(LDFLAGS_LIBSWSCALE) $(LDFLAGS_LIBAVUTIL) $(LDFLAGS_LIBPOSTPROC) +LDFLAGS_POST += $(LDFLAGS_FFMPEGSOURCE) +endif + + +########### +# SUBTITLES +########### +ifeq (yes, $(WITH_LIBASS)) +SRC_OPT += subtitles_provider_libass.cpp +subtitles_provider_libass.o: CXXFLAGS += $(CFLAGS_LIBASS) $(CFLAGS_ICONV) +LDFLAGS += $(LDFLAGS_LIBASS) $(LDFLAGS_ICONV) $(LDFLAGS_FONTCONFIG) +LDFLAGS_POST += $(LDFLAGS_LIBASS) +endif + + +############ +# AUTOMATION +############ +ifeq (yes, $(HAVE_AUTO4_LUA)) +SRC_OPT += auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_scriptreader.cpp +auto4_lua.o auto4_lua_assfile.o auto4_lua_dialog.o auto4_lua_scriptreader.o: CXXFLAGS += $(CFLAGS_LUA) +LDFLAGS += $(LDFLAGS_LUA) +endif + + +############## +# MISCELLANOUS +############## +ifeq (yes, $(HAVE_HUNSPELL)) +SRC_OPT += spellchecker_hunspell.cpp +spellchecker_hunspell.o: CXXFLAGS += $(CFLAGS_HUNSPELL) +LDFLAGS += $(LDFLAGS_HUNSPELL) +endif + + +##################### +# SOURCE-LEVEL CFLAGS +##################### +audio_player.o: CXXFLAGS += $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL) +audio_provider.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) +auto4_base.o: CXXFLAGS += $(CFLAGS_FREETYPE) +charset_detect.o: CXXFLAGS += -D_X86_ +font_file_lister_fontconfig.o: CXXFLAGS += $(CFLAGS_FONTCONFIG) $(CFLAGS_FREETYPE) +font_file_lister.o: CXXFLAGS += $(CFLAGS_FREETYPE) +text_file_reader.o: CXXFLAGS += -D_X86_ +video_provider_manager.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) + + +# Ensure any optional source files above are added for compilation. +SRC += $(SRC_OPT) + +SRC += \ + MatroskaParser.c \ + aegisublocale.cpp \ + ass_attachment.cpp \ + ass_dialogue.cpp \ + ass_entry.cpp \ + ass_export_filter.cpp \ + ass_exporter.cpp \ + ass_file.cpp \ + ass_karaoke.cpp \ + ass_override.cpp \ + ass_style.cpp \ + ass_style_storage.cpp \ + ass_time.cpp \ + audio_box.cpp \ + audio_display.cpp \ + audio_karaoke.cpp \ + audio_player.cpp \ + audio_provider.cpp \ + audio_provider_convert.cpp \ + audio_provider_downmix.cpp \ + audio_provider_hd.cpp \ + audio_provider_pcm.cpp \ + audio_provider_ram.cpp \ + audio_renderer.cpp \ + audio_renderer_spectrum.cpp \ + auto4_base.cpp \ + avisynth_wrap.cpp \ + base_grid.cpp \ + browse_button.cpp \ + charset_conv.cpp \ + charset_detect.cpp \ + colorspace.cpp \ + colour_button.cpp \ + compat.cpp \ + dialog_about.cpp \ + dialog_attachments.cpp \ + dialog_automation.cpp \ + dialog_colorpicker.cpp \ + dialog_detached_video.cpp \ + dialog_dummy_video.cpp \ + dialog_export.cpp \ + dialog_fonts_collector.cpp \ + dialog_jumpto.cpp \ + dialog_kara_timing_copy.cpp \ + dialog_log.cpp \ + dialog_paste_over.cpp \ + dialog_progress.cpp \ + dialog_properties.cpp \ + dialog_resample.cpp \ + dialog_search_replace.cpp \ + dialog_selected_choices.cpp \ + dialog_selection.cpp \ + dialog_shift_times.cpp \ + dialog_spellchecker.cpp \ + dialog_style_editor.cpp \ + dialog_style_manager.cpp \ + dialog_styling_assistant.cpp \ + dialog_text_import.cpp \ + dialog_timing_processor.cpp \ + dialog_translation.cpp \ + dialog_version_check.cpp \ + dialog_video_details.cpp \ + drop.cpp \ + audio_provider_dummy.cpp \ + export_clean_info.cpp \ + export_fixstyle.cpp \ + export_framerate.cpp \ + fft.cpp \ + font_file_lister.cpp \ + font_file_lister_fontconfig.cpp \ + frame_main.cpp \ + frame_main_events.cpp \ + gl_text.cpp \ + gl_wrap.cpp \ + help_button.cpp \ + hotkeys.cpp \ + kana_table.cpp \ + keyframe.cpp \ + main.cpp \ + md5.c \ + mkv_wrap.cpp \ + mythes.cxx \ + plugin_manager.cpp \ + preferences.cpp \ + preferences_base.cpp \ + scintilla_text_ctrl.cpp \ + spellchecker.cpp \ + spline.cpp \ + spline_curve.cpp \ + standard_paths.cpp \ + static_bmp.cpp \ + string_codec.cpp \ + subs_edit_box.cpp \ + subs_edit_ctrl.cpp \ + subs_grid.cpp \ + subs_preview.cpp \ + subtitle_format.cpp \ + subtitle_format_ass.cpp \ + subtitle_format_dvd.cpp \ + subtitle_format_encore.cpp \ + subtitle_format_microdvd.cpp \ + subtitle_format_mkv.cpp \ + subtitle_format_srt.cpp \ + subtitle_format_transtation.cpp \ + subtitle_format_ttxt.cpp \ + subtitle_format_txt.cpp \ + subtitles_provider.cpp \ + text_file_reader.cpp \ + text_file_writer.cpp \ + thesaurus.cpp \ + thesaurus_myspell.cpp \ + timeedit_ctrl.cpp \ + threaded_frame_source.cpp \ + toggle_bitmap.cpp \ + tooltip_manager.cpp \ + utils.cpp \ + validators.cpp \ + variable_data.cpp \ + vector2d.cpp \ + version.cpp \ + video_box.cpp \ + video_context.cpp \ + video_display.cpp \ + video_frame.cpp \ + video_out_gl.cpp \ + video_provider_cache.cpp \ + video_provider_dummy.cpp \ + video_provider_manager.cpp \ + video_provider_yuv4mpeg.cpp \ + video_slider.cpp \ + visual_feature.cpp \ + visual_tool.cpp \ + visual_tool_clip.cpp \ + visual_tool_cross.cpp \ + visual_tool_drag.cpp \ + visual_tool_rotatexy.cpp \ + visual_tool_rotatez.cpp \ + visual_tool_scale.cpp \ + visual_tool_vector_clip.cpp + + +HEADER += \ + *.h \ + include/aegisub/*.h \ + config/*.h + + +EXTRA_DIST = \ + $(SRC_OPT) \ + *.hxx + +EXTRA_DIST= \ + bitmaps/16/*.png \ + bitmaps/24/*.png \ + bitmaps/misc/*.png \ + bitmaps/windows/eyedropper.cur \ + bitmaps/windows/icon.ico + +include ../Makefile.target + diff --git a/aegisub/src/Makefile.am b/aegisub/src/Makefile.am deleted file mode 100644 index 9e32cfbbc..000000000 --- a/aegisub/src/Makefile.am +++ /dev/null @@ -1,314 +0,0 @@ -AUTOMAKE_OPTIONS = foreign -SUFFIXES = .c .cpp .rc -noinst_LIBRARIES= -AM_CXXFLAGS = -DISTCLEANFILES = - -if PRECOMPILED_HEADER -BUILT_SOURCES = agi_pre.h.gch -precompiled_header = agi_pre.h -AM_CXXFLAGS += -Winvalid-pch -fpch-deps -fpch-preprocess -include agi_pre.h -nodist_aegisub_3_0_SOURCES = agi_pre.h.gch -DISTCLEANFILES += agi_pre.h.gch -endif - -SUBDIRS = \ - bitmaps \ - libresrc - -AM_CXXFLAGS += -DAEGISUB -D__STDC_FORMAT_MACROS -Iinclude -I../libffms/include -I../libaegisub/include @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ - -bin_PROGRAMS = aegisub-3.0 -aegisub_3_0_LDADD = libresrc/libresrc.a -L../libaegisub -laegisub-3.0 -aegisub_3_0_CPPFLAGS = @FREETYPE_CFLAGS@ -aegisub_3_0_LDFLAGS = @DEBUG_FLAGS@ @PROFILE_FLAGS@ @GL_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@ @CCMALLOC_LDFLAGS@ @EFENCE_LDFLAGS@ -LIBS += @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @CCMALLOC_LIBS@ - -if PRECOMPILED_HEADER -# This doesn't depend on Makefile on purpose, you should already know what you're doing when using this. -agi_pre.h.gch: agi_pre.h - @CXX@ -include ../acconf.h $(DEFAULT_INCLUDES) @CXXFLAGS@ $(AM_CXXFLAGS) @DEBUG_FLAGS@ @PROFILE_FLAGS@ agi_pre.h -endif - -if BUILD_DARWIN -aegisub_3_0_LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries -endif - -noinst_LIBRARIES += libaudio_player.a -libaudio_player_a_SOURCES = audio_player.cpp -libaudio_player_a_CPPFLAGS = @ALSA_CFLAGS@ @PORTAUDIO_CFLAGS@ @LIBPULSE_CFLAGS@ @OPENAL_CFLAGS@ -aegisub_3_0_LDADD += libaudio_player.a - -if HAVE_ALSA -noinst_LIBRARIES += libaudio_alsa.a -libaudio_alsa_a_SOURCES = audio_player_alsa.cpp -aegisub_3_0_LDFLAGS += @ALSA_LDFLAGS@ -aegisub_3_0_LDADD += libaudio_alsa.a -endif - -if HAVE_PORTAUDIO -noinst_LIBRARIES += libaudio_portaudio.a -libaudio_portaudio_a_SOURCES = audio_player_portaudio.cpp -libaudio_portaudio_a_CPPFLAGS = @PORTAUDIO_CFLAGS@ -aegisub_3_0_LDFLAGS += @PORTAUDIO_LIBS@ -aegisub_3_0_LDADD += libaudio_portaudio.a -endif - -if HAVE_PULSEAUDIO -noinst_LIBRARIES += libaudio_pulseaudio.a -libaudio_pulseaudio_a_SOURCES = audio_player_pulse.cpp -libaudio_pulseaudio_a_CPPFLAGS = @LIBPULSE_CFLAGS@ -aegisub_3_0_LDFLAGS += @LIBPULSE_LIBS@ -aegisub_3_0_LDADD += libaudio_pulseaudio.a -endif - -if HAVE_OPENAL -noinst_LIBRARIES += libaudio_openal.a -libaudio_openal_a_SOURCES = audio_player_openal.cpp -libaudio_openal_a_CPPFLAGS = @OPENAL_CFLAGS@ -aegisub_3_0_LDFLAGS += @OPENAL_LIBS@ -aegisub_3_0_LDADD += libaudio_openal.a -endif - -if HAVE_OSS -noinst_LIBRARIES += libaudio_oss.a -libaudio_oss_a_SOURCES = audio_player_oss.cpp -aegisub_3_0_LDADD += libaudio_oss.a -endif - -if HAVE_FFMPEG -aegisub_3_0_LDFLAGS += @LIBAVFORMAT_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@ -endif - -if HAVE_PROVIDER_FFMPEGSOURCE -noinst_LIBRARIES += libaudiovideo_ffmpegsource.a -libaudiovideo_ffmpegsource_a_SOURCES = audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp -libaudiovideo_ffmpegsource_a_CPPFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@ -aegisub_3_0_LDADD += libaudiovideo_ffmpegsource.a ../libffms/libffmpegsource_aegisub.a -aegisub_3_0_LDFLAGS += @LIBPOSTPROC_LIBS@ -endif - -noinst_LIBRARIES += libsubtitle_provider.a -libsubtitle_provider_a_SOURCES = subtitles_provider.cpp -libsubtitle_provider_a_CPPFLAGS = @CSRI_CFLAGS@ -aegisub_3_0_LDADD += libsubtitle_provider.a - -if WITH_LIBASS -noinst_LIBRARIES += libsubtitle_ass.a -libsubtitle_ass_a_SOURCES = subtitles_provider_libass.cpp -libsubtitle_ass_a_CPPFLAGS = @LIBASS_CFLAGS@ @ICONV_CFLAGS@ -LIBS += @LIBASS_LIBS@ -aegisub_3_0_LDADD += libsubtitle_ass.a -aegisub_3_0_LDFLAGS += @FONTCONFIG_LIBS@ -endif - -if WITH_CSRI -noinst_LIBRARIES += libsubtitle_csri.a -libsubtitle_csri_a_SOURCES = subtitles_provider_csri.cpp -libsubtitle_csri_a_CPPFLAGS = @ICONV_CFLAGS@ @CSRI_CFLAGS@ -LIBS += @CSRI_LIBS@ -aegisub_3_0_LDADD += libsubtitle_csri.a -aegisub_3_0_LDFLAGS += @FONTCONFIG_LIBS@ -endif - -if HAVE_AUTO4_LUA -noinst_LIBRARIES += libauto4_lua.a -libauto4_lua_a_SOURCES = auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_scriptreader.cpp -libauto4_lua_a_CPPFLAGS = @LUA_CFLAGS@ -LIBS += @LUA_LDFLAGS@ -aegisub_3_0_LDADD += libauto4_lua.a -endif - -if HAVE_HUNSPELL -noinst_LIBRARIES += libmisc_hunspell.a -libmisc_hunspell_a_SOURCES = spellchecker_hunspell.cpp -aegisub_3_0_LDFLAGS += @HUNSPELL_LIBS@ -aegisub_3_0_LDADD += libmisc_hunspell.a -endif - -if FONTLISTER_FREETYPE - FONT_LISTER = font_file_lister_freetype.cpp -endif - -if FONTLISTER_FONTCONFIG - FONT_LISTER = font_file_lister_fontconfig.cpp -endif - -noinst_LIBRARIES += libmisc_universalchardet.a -libmisc_universalchardet_a_SOURCES = charset_detect.cpp text_file_reader.cpp -libmisc_universalchardet_a_CPPFLAGS = -D_X86_ -aegisub_3_0_LDADD += libmisc_universalchardet.a ../universalchardet/libuniversalchardet.a - -## These aren't built, but are listed here so 'make dist' can always find all the sources -## This should also list all Win32 specific files -EXTRA_aegisub_3_0_SOURCES = \ - $(precompiled_header) \ - font_file_lister.cpp \ - $(FONT_LISTER) \ - audio_player_dsound.cpp \ - audio_player_dsound2.cpp \ - audio_player_portaudio.cpp \ - audio_player_pulse.cpp \ - audio_player_oss.cpp \ - audio_provider_avs.cpp \ - auto4_lua.cpp \ - auto4_lua_assfile.cpp \ - auto4_lua_dialog.cpp \ - auto4_lua_scriptreader.cpp \ - avisynth_wrap.cpp \ - setup.cpp \ - spellchecker_hunspell.cpp \ - subtitles_provider_csri.cpp \ - subtitles_provider_libass.cpp \ - video_provider_avs.cpp - - -aegisub_3_0_SOURCES = \ - $(FFMPEG) \ - $(HUNSPELL) \ - $(LIBASS) \ - font_file_lister.cpp \ - $(FONT_LISTER) \ - MatroskaParser.c \ - aegisublocale.cpp \ - ass_attachment.cpp \ - ass_dialogue.cpp \ - ass_entry.cpp \ - ass_export_filter.cpp \ - ass_exporter.cpp \ - ass_file.cpp \ - ass_karaoke.cpp \ - ass_override.cpp \ - ass_style.cpp \ - ass_style_storage.cpp \ - ass_time.cpp \ - audio_box.cpp \ - audio_display.cpp \ - audio_karaoke.cpp \ - audio_provider.cpp \ - audio_provider_convert.cpp \ - audio_provider_downmix.cpp \ - audio_provider_hd.cpp \ - audio_provider_pcm.cpp \ - audio_provider_ram.cpp \ - audio_renderer.cpp \ - audio_renderer_spectrum.cpp \ - auto4_base.cpp \ - avisynth_wrap.cpp \ - base_grid.cpp \ - browse_button.cpp \ - charset_conv.cpp \ - colorspace.cpp \ - colour_button.cpp \ - compat.cpp \ - dialog_about.cpp \ - dialog_attachments.cpp \ - dialog_automation.cpp \ - dialog_colorpicker.cpp \ - dialog_detached_video.cpp \ - dialog_dummy_video.cpp \ - dialog_export.cpp \ - dialog_fonts_collector.cpp \ - dialog_jumpto.cpp \ - dialog_kara_timing_copy.cpp \ - dialog_log.cpp \ - dialog_paste_over.cpp \ - dialog_progress.cpp \ - dialog_properties.cpp \ - dialog_resample.cpp \ - dialog_search_replace.cpp \ - dialog_selected_choices.cpp \ - dialog_selection.cpp \ - dialog_shift_times.cpp \ - dialog_spellchecker.cpp \ - dialog_style_editor.cpp \ - dialog_style_manager.cpp \ - dialog_styling_assistant.cpp \ - dialog_text_import.cpp \ - dialog_timing_processor.cpp \ - dialog_translation.cpp \ - dialog_version_check.cpp \ - dialog_video_details.cpp \ - drop.cpp \ - audio_provider_dummy.cpp \ - export_clean_info.cpp \ - export_fixstyle.cpp \ - export_framerate.cpp \ - fft.cpp \ - frame_main.cpp \ - frame_main_events.cpp \ - gl_text.cpp \ - gl_wrap.cpp \ - help_button.cpp \ - hotkeys.cpp \ - kana_table.cpp \ - keyframe.cpp \ - main.cpp \ - md5.c \ - mkv_wrap.cpp \ - mythes.cxx \ - plugin_manager.cpp \ - preferences.cpp \ - preferences_base.cpp \ - scintilla_text_ctrl.cpp \ - spellchecker.cpp \ - spline.cpp \ - spline_curve.cpp \ - standard_paths.cpp \ - static_bmp.cpp \ - string_codec.cpp \ - subs_edit_box.cpp \ - subs_edit_ctrl.cpp \ - subs_grid.cpp \ - subs_preview.cpp \ - subtitle_format.cpp \ - subtitle_format_ass.cpp \ - subtitle_format_dvd.cpp \ - subtitle_format_encore.cpp \ - subtitle_format_microdvd.cpp \ - subtitle_format_mkv.cpp \ - subtitle_format_srt.cpp \ - subtitle_format_transtation.cpp \ - subtitle_format_ttxt.cpp \ - subtitle_format_txt.cpp \ - text_file_writer.cpp \ - thesaurus.cpp \ - thesaurus_myspell.cpp \ - timeedit_ctrl.cpp \ - threaded_frame_source.cpp \ - toggle_bitmap.cpp \ - tooltip_manager.cpp \ - utils.cpp \ - validators.cpp \ - variable_data.cpp \ - vector2d.cpp \ - version.cpp \ - video_box.cpp \ - video_context.cpp \ - video_display.cpp \ - video_frame.cpp \ - video_out_gl.cpp \ - video_provider_cache.cpp \ - video_provider_dummy.cpp \ - video_provider_manager.cpp \ - video_provider_yuv4mpeg.cpp \ - video_slider.cpp \ - visual_feature.cpp \ - visual_tool.cpp \ - visual_tool_clip.cpp \ - visual_tool_cross.cpp \ - visual_tool_drag.cpp \ - visual_tool_rotatexy.cpp \ - visual_tool_rotatez.cpp \ - visual_tool_scale.cpp \ - visual_tool_vector_clip.cpp - - -aegisub_3_0_SOURCES += \ - $(srcdir)/*.h \ - $(srcdir)/include/aegisub/*.h \ - $(srcdir)/config/*.h - -noinst_HEADERS = \ - gl/glext.h \ - $(srcdir)/*.hxx diff --git a/aegisub/src/bitmaps/Makefile.am b/aegisub/src/bitmaps/Makefile.am deleted file mode 100644 index b20029353..000000000 --- a/aegisub/src/bitmaps/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -EXTRA_DIST= \ - 16/*.png \ - 24/*.png \ - misc/*.png \ - windows/eyedropper.cur \ - windows/icon.ico diff --git a/aegisub/src/libresrc/Makefile.am b/aegisub/src/libresrc/Makefile similarity index 64% rename from aegisub/src/libresrc/Makefile.am rename to aegisub/src/libresrc/Makefile index 246129d58..0c52d88f2 100644 --- a/aegisub/src/libresrc/Makefile.am +++ b/aegisub/src/libresrc/Makefile @@ -1,10 +1,18 @@ -noinst_LIBRARIES = libresrc.a +include ../../Makefile.inc -libresrc_a_SOURCES = libresrc.cpp libresrc.h -nodist_libresrc_a_SOURCES = bitmap.cpp bitmap.h default_config.cpp default_config.h -libresrc_a_CPPFLAGS = @WX_CPPFLAGS@ +LIB = libresrc.a -BUILT_SOURCES = bitmap.cpp default_config.cpp +CPPFLAGS = $(CPPFLAGS_WX) + +SRC = \ + bitmap.cpp \ + default_config.cpp \ + libresrc.cpp + +HEADER= \ + libresrc.h + +all: bitmap.cpp default_config.cpp bitmap.cpp: ../../tools/common-respack ../../tools/common-respack bitmap.cpp ../bitmaps/16 ../bitmaps/24 ../bitmaps/misc/splash.png ../bitmaps/misc/wxicon.png @@ -23,3 +31,5 @@ CLEANFILES= \ bitmap.h \ default_config.cpp \ default_config.h + +include ../../Makefile.target diff --git a/aegisub/tests/Makefile b/aegisub/tests/Makefile new file mode 100644 index 000000000..8f6a69b16 --- /dev/null +++ b/aegisub/tests/Makefile @@ -0,0 +1,31 @@ +# $Id$ +include ../Makefile.inc + +PROGRAM = run + +LDFLAGS += -L../libaegisub -laegisub-3.0 -rpath $(CURDIR)/../libaegisub -lgtest -L../universalchardet -luniversalchardet +LDFLAGS += $(LDFLAGS_ICONV) + +CPPFLAGS += -I../src/include -I../libaegisub/include $(CFLAGS_ICONV) + + +ifdef $(BUILD_DARWIN) +LDFLAGS += -framework ApplicationServices +endif + +SRC = \ + main.cpp \ + util.cpp \ + util_unix.cpp \ + libaegisub_access.cpp \ + libaegisub_cajun.cpp \ + libaegisub_iconv.cpp \ + libaegisub_line_iterator.cpp \ + libaegisub_mru.cpp \ + libaegisub_util.cpp \ + libaegisub_vfr.cpp + +HEADER = \ + *.h + +include ../Makefile.target diff --git a/aegisub/tests/Makefile.am b/aegisub/tests/Makefile.am deleted file mode 100644 index 4f7ce1552..000000000 --- a/aegisub/tests/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# $Id$ - -bin_PROGRAMS = run - -run_LDFLAGS= -L../libaegisub -laegisub-3.0 -lgtest @ICONV_LDFLAGS@ -L../universalchardet -luniversalchardet -run_CPPFLAGS= -I../src/include -I../libaegisub/include - -if BUILD_DARWIN -run_LDFLAGS += -framework ApplicationServices -endif - -run_SOURCES = \ - main.cpp \ - util.cpp \ - util_unix.cpp \ - libaegisub_access.cpp \ - libaegisub_cajun.cpp \ - libaegisub_iconv.cpp \ - libaegisub_line_iterator.cpp \ - libaegisub_mru.cpp \ - libaegisub_util.cpp \ - libaegisub_vfr.cpp - -run_SOURCES += \ - *.h diff --git a/aegisub/tools/Makefile b/aegisub/tools/Makefile new file mode 100644 index 000000000..cbe06482a --- /dev/null +++ b/aegisub/tools/Makefile @@ -0,0 +1,24 @@ +include ../Makefile.inc + +PROGRAM = common-respack + +SRC += common-respack.cpp +CPPFLAGS += $(CPPFLAGS_WX) +LDFLAGS += $(LDFLAGS_WX) + +ifdef $(BUILD_DARWIN) +bin_PROGRAMS += osx-bundle-restart-helper +osx_bundle_restart_helper_SOURCES = osx-bundle-restart-helper.c +endif + + +EXTRA_DIST = \ + osx-bundle-restart-helper.c \ + osx-bundle.sh \ + osx-dmg.sh \ + osx-fix-libs.py + +CLEANFILES= \ + osx-bundle.sed + +include ../Makefile.target diff --git a/aegisub/tools/Makefile.am b/aegisub/tools/Makefile.am deleted file mode 100644 index 7fd36a130..000000000 --- a/aegisub/tools/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -bin_PROGRAMS = common-respack -common_respack_CPPFLAGS = @WX_CPPFLAGS@ -common_respack_LDFLAGS = @WX_LIBS@ -common_respack_SOURCES = common-respack.cpp - -if BUILD_DARWIN -bin_PROGRAMS += osx-bundle-restart-helper -osx_bundle_restart_helper_SOURCES = osx-bundle-restart-helper.c -endif - -EXTRA_DIST = \ - osx-bundle-restart-helper.c \ - osx-bundle.sh \ - osx-dmg.sh \ - osx-fix-libs.py diff --git a/aegisub/universalchardet/Makefile.am b/aegisub/universalchardet/Makefile similarity index 51% rename from aegisub/universalchardet/Makefile.am rename to aegisub/universalchardet/Makefile index 47a1f7d19..b4182353d 100644 --- a/aegisub/universalchardet/Makefile.am +++ b/aegisub/universalchardet/Makefile @@ -1,8 +1,10 @@ -noinst_LIBRARIES = libuniversalchardet.a +include ../Makefile.inc -AM_CPPFLAGS = -D_X86_ +LIB = libuniversalchardet.a -libuniversalchardet_a_SOURCES = \ +CXXFLAGS += -D_X86_ + +SRC = \ CharDistribution.cpp \ JpCntx.cpp \ LangBulgarianModel.cpp \ @@ -29,33 +31,7 @@ libuniversalchardet_a_SOURCES = \ nsUTF8Prober.cpp \ nsUniversalDetector.cpp -libuniversalchardet_a_SOURCES += \ - CharDistribution.h \ - JpCntx.h \ - nsBig5Prober.h \ - nsCharSetProber.h \ - nsCodingStateMachine.h \ - nsEUCJPProber.h \ - nsEUCKRProber.h \ - nsEUCTWProber.h \ - nsError.h \ - nsEscCharsetProber.h \ - nsGB2312Prober.h \ - nsHebrewProber.h \ - nsLatin1Prober.h \ - nsMBCSGroupProber.h \ - nsPkgInt.h \ - nsSBCSGroupProber.h \ - nsSBCharSetProber.h \ - nsSJISProber.h \ - nsUTF8Prober.h \ - nsUniversalDetector.h \ - nscore.h \ - prcpucfg.h \ - prmem.h \ - protypes.h \ - prtypes.h \ - xpcom-config.h +HEADER = *.h EXTRA_DIST = \ Big5Freq.tab \ @@ -63,3 +39,5 @@ EXTRA_DIST = \ EUCTWFreq.tab \ GB2312Freq.tab \ JISFreq.tab + +include ../Makefile.target