Typos fixed and further clarification of the Python situation on Panther

[wxWidgets.git] / contrib / src / mmedia / Makefile.in

diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in
index ec943e1255d18506d5cae4d803bfceeb5d2c8b49..4a595dffdd59d79520fcd834875c788bf85f6568 100644 (file)
--- a/contrib/src/mmedia/Makefile.in
+++ b/contrib/src/mmedia/Makefile.in
@@ -45,9 +45,9 @@ top_srcdir = @top_srcdir@
 
 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-MMEDIADLL_CXXFLAGS = $(__mmediadll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \
-       -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA $(CXXFLAGS) $(PIC_FLAG)
+MMEDIADLL_CXXFLAGS = $(__mmediadll_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
+       -DWXMAKINGDLL_MMEDIA $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 MMEDIADLL_OBJECTS =  \
        $(__MMEDIA_PLATFORM_SRC_OBJECTS) \
        mmediadll_cdbase.o \
@@ -67,9 +67,9 @@ MMEDIADLL_OBJECTS =  \
        mmediadll_sndulaw.o \
        mmediadll_sndwav.o \
        mmediadll_vidbase.o
-MMEDIALIB_CXXFLAGS = $(__mmedialib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \
-       $(CXXFLAGS)
+MMEDIADLL_ODEP =  $(___pch_wxprec_mmediadll_wx_wxprec_h_gch___depname)
+MMEDIALIB_CXXFLAGS = $(__mmedialib_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
 MMEDIALIB_OBJECTS =  \
        $(__MMEDIA_PLATFORM_SRC_OBJECTS_1) \
        mmedialib_cdbase.o \
@@ -89,6 +89,7 @@ MMEDIALIB_OBJECTS =  \
        mmedialib_sndulaw.o \
        mmedialib_sndwav.o \
        mmedialib_vidbase.o
+MMEDIALIB_ODEP =  $(___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname)
 WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
@@ -155,9 +156,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_GCC_PCH_1@___pch_wxprec_mmediadll_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_mmediadll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_mmedialib/wx/wxprec.h.gch
 @COND_SHARED_1@__install_mmediadll___depname = install_mmediadll
 @COND_SHARED_0@__install_mmedialib___depname = install_mmedialib
-@COND_GCC_PCH_1@__mmediadll_PCH_DEP = .pch/wxprec_mmediadll/wx/wxprec.h.gch
 @COND_GCC_PCH_1@__mmediadll_PCH_INC = -I.pch/wxprec_mmediadll
 COND_SHARED_1___mmediadll___depname = \
        $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
@@ -207,7 +211,6 @@ COND_USE_SOVERSOLARIS_1___mmediadll___soname_flags = \
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .1.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__mmediadll___targetsuf3 = .$(SO_SUFFIX)
-@COND_GCC_PCH_1@__mmedialib_PCH_DEP = .pch/wxprec_mmedialib/wx/wxprec.h.gch
 @COND_GCC_PCH_1@__mmedialib_PCH_INC = -I.pch/wxprec_mmedialib
 COND_SHARED_0___mmedialib___depname = \
        $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a
@@ -256,158 +259,158 @@ install-strip: install
 @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
 @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(__mmediadll_PCH_DEP)  $(MMEDIADLL_OBJECTS)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS)
 @COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(__mmediadll___macver) $(EXTRALIBS_ESD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 @COND_SHARED_1@        
 @COND_SHARED_1@        $(__mmediadll___so_symlinks_cmd)
 
-mmediadll_cdbase.o: $(srcdir)/cdbase.cpp
+mmediadll_cdbase.o: $(srcdir)/cdbase.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_cdunix.o: $(srcdir)/cdunix.cpp
+mmediadll_cdunix.o: $(srcdir)/cdunix.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_cdwin.o: $(srcdir)/cdwin.cpp
+mmediadll_cdwin.o: $(srcdir)/cdwin.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_g711.o: $(srcdir)/g711.cpp
+mmediadll_g711.o: $(srcdir)/g711.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_g721.o: $(srcdir)/g721.cpp
+mmediadll_g721.o: $(srcdir)/g721.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_g723_24.o: $(srcdir)/g723_24.cpp
+mmediadll_g723_24.o: $(srcdir)/g723_24.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_g723_40.o: $(srcdir)/g723_40.cpp
+mmediadll_g723_40.o: $(srcdir)/g723_40.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_g72x.o: $(srcdir)/g72x.cpp
+mmediadll_g72x.o: $(srcdir)/g72x.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_sndaiff.o: $(srcdir)/sndaiff.cpp
+mmediadll_sndaiff.o: $(srcdir)/sndaiff.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_sndbase.o: $(srcdir)/sndbase.cpp
+mmediadll_sndbase.o: $(srcdir)/sndbase.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_sndcodec.o: $(srcdir)/sndcodec.cpp
+mmediadll_sndcodec.o: $(srcdir)/sndcodec.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_sndcpcm.o: $(srcdir)/sndcpcm.cpp
+mmediadll_sndcpcm.o: $(srcdir)/sndcpcm.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_sndesd.o: $(srcdir)/sndesd.cpp
+mmediadll_sndesd.o: $(srcdir)/sndesd.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_sndfile.o: $(srcdir)/sndfile.cpp
+mmediadll_sndfile.o: $(srcdir)/sndfile.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_sndg72x.o: $(srcdir)/sndg72x.cpp
+mmediadll_sndg72x.o: $(srcdir)/sndg72x.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_sndmsad.o: $(srcdir)/sndmsad.cpp
+mmediadll_sndmsad.o: $(srcdir)/sndmsad.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_sndoss.o: $(srcdir)/sndoss.cpp
+mmediadll_sndoss.o: $(srcdir)/sndoss.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_sndpcm.o: $(srcdir)/sndpcm.cpp
+mmediadll_sndpcm.o: $(srcdir)/sndpcm.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_sndulaw.o: $(srcdir)/sndulaw.cpp
+mmediadll_sndulaw.o: $(srcdir)/sndulaw.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_sndwav.o: $(srcdir)/sndwav.cpp
+mmediadll_sndwav.o: $(srcdir)/sndwav.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_sndwin.o: $(srcdir)/sndwin.cpp
+mmediadll_sndwin.o: $(srcdir)/sndwin.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_vidbase.o: $(srcdir)/vidbase.cpp
+mmediadll_vidbase.o: $(srcdir)/vidbase.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_vidwin.o: $(srcdir)/vidwin.cpp
+mmediadll_vidwin.o: $(srcdir)/vidwin.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-mmediadll_vidxanm.o: $(srcdir)/vidxanm.cpp
+mmediadll_vidxanm.o: $(srcdir)/vidxanm.cpp $(MMEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a: $(__mmedialib_PCH_DEP)  $(MMEDIALIB_OBJECTS)
+@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a: $(MMEDIALIB_OBJECTS)
 @COND_SHARED_0@        rm -f $@
 @COND_SHARED_0@        $(AR) rcu $@ $(MMEDIALIB_OBJECTS)
 @COND_SHARED_0@        $(RANLIB) $@
 
-mmedialib_cdbase.o: $(srcdir)/cdbase.cpp
+mmedialib_cdbase.o: $(srcdir)/cdbase.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_cdunix.o: $(srcdir)/cdunix.cpp
+mmedialib_cdunix.o: $(srcdir)/cdunix.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_cdwin.o: $(srcdir)/cdwin.cpp
+mmedialib_cdwin.o: $(srcdir)/cdwin.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_g711.o: $(srcdir)/g711.cpp
+mmedialib_g711.o: $(srcdir)/g711.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_g721.o: $(srcdir)/g721.cpp
+mmedialib_g721.o: $(srcdir)/g721.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_g723_24.o: $(srcdir)/g723_24.cpp
+mmedialib_g723_24.o: $(srcdir)/g723_24.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_g723_40.o: $(srcdir)/g723_40.cpp
+mmedialib_g723_40.o: $(srcdir)/g723_40.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_g72x.o: $(srcdir)/g72x.cpp
+mmedialib_g72x.o: $(srcdir)/g72x.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_sndaiff.o: $(srcdir)/sndaiff.cpp
+mmedialib_sndaiff.o: $(srcdir)/sndaiff.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_sndbase.o: $(srcdir)/sndbase.cpp
+mmedialib_sndbase.o: $(srcdir)/sndbase.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_sndcodec.o: $(srcdir)/sndcodec.cpp
+mmedialib_sndcodec.o: $(srcdir)/sndcodec.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_sndcpcm.o: $(srcdir)/sndcpcm.cpp
+mmedialib_sndcpcm.o: $(srcdir)/sndcpcm.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_sndesd.o: $(srcdir)/sndesd.cpp
+mmedialib_sndesd.o: $(srcdir)/sndesd.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_sndfile.o: $(srcdir)/sndfile.cpp
+mmedialib_sndfile.o: $(srcdir)/sndfile.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_sndg72x.o: $(srcdir)/sndg72x.cpp
+mmedialib_sndg72x.o: $(srcdir)/sndg72x.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_sndmsad.o: $(srcdir)/sndmsad.cpp
+mmedialib_sndmsad.o: $(srcdir)/sndmsad.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_sndoss.o: $(srcdir)/sndoss.cpp
+mmedialib_sndoss.o: $(srcdir)/sndoss.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_sndpcm.o: $(srcdir)/sndpcm.cpp
+mmedialib_sndpcm.o: $(srcdir)/sndpcm.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_sndulaw.o: $(srcdir)/sndulaw.cpp
+mmedialib_sndulaw.o: $(srcdir)/sndulaw.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_sndwav.o: $(srcdir)/sndwav.cpp
+mmedialib_sndwav.o: $(srcdir)/sndwav.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_sndwin.o: $(srcdir)/sndwin.cpp
+mmedialib_sndwin.o: $(srcdir)/sndwin.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_vidbase.o: $(srcdir)/vidbase.cpp
+mmedialib_vidbase.o: $(srcdir)/vidbase.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_vidwin.o: $(srcdir)/vidwin.cpp
+mmedialib_vidwin.o: $(srcdir)/vidwin.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-mmedialib_vidxanm.o: $(srcdir)/vidxanm.cpp
+mmedialib_vidxanm.o: $(srcdir)/vidxanm.cpp $(MMEDIALIB_ODEP)
        $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
 uninstall: