Starting to update the tarball and rpm spec files for 2.5. Mostly

[wxWidgets.git] / contrib / samples / ogl / studio / Makefile.in

diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in
index 0ff8f53d54bbbe5153124e0f0858c8cc57fb71dc..cfcc9ccbeaa6ee0c11e23a06c0b6a3dd895c64aa 100644 (file)
--- a/contrib/samples/ogl/studio/Makefile.in
+++ b/contrib/samples/ogl/studio/Makefile.in
@@ -16,9 +16,11 @@ CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
+EXTRALIBS_HTML = @EXTRALIBS_HTML@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
+NM = @NM@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -33,11 +35,13 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-STUDIO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS)
+STUDIO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
+       -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
 STUDIO_OBJECTS =  \
+       $(__studio_os2_lib_res) \
        studio_studio.o \
        studio_doc.o \
        studio_shapes.o \
@@ -49,7 +53,7 @@ STUDIO_OBJECTS =  \
        studio_dialogs.o \
        studio_csprint.o \
        $(__studio___win32rc)
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -83,10 +87,9 @@ WX_VERSION = 2.5.0
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
-       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \
-       $(srcdir)/../../../include -o studio$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       $(srcdir)/../../../../samples -i $(srcdir)/../../../include -o \
+       studio$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)
@@ -96,6 +99,9 @@ COND_MONOLITHIC_0___WXLIB_ADV_p = \
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
 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)
@@ -105,8 +111,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__studio___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__studio___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C studio$(EXEEXT)
+COND_PLATFORM_OS2_1___studio___os2_emxbindcmd = $(NM) studio$(EXEEXT) | if grep \
+       -q pmwin.763 ; then emxbind -ep studio$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__studio___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___studio___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__studio___win32rc = studio_studio_rc.o
 @COND_PLATFORM_MACOSX_1@__studio_bundle___depname = studio_bundle
+@COND_PLATFORM_OS2_1@__studio_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -134,12 +145,13 @@ install: all
 install-strip: install
 
 studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc)
-       $(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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)
+       $(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__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)
        $(__studio___mac_rezcmd)
        $(__studio___mac_setfilecmd)
+       $(__studio___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-studio.app/Contents: studio$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p studio.app/Contents
        mkdir -p studio.app/Contents/MacOS
        mkdir -p studio.app/Contents/Resources
@@ -157,10 +169,10 @@ studio.app/Contents: studio$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
        ln -f studio$(EXEEXT) studio.app/Contents/MacOS/studio
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc studio.app/Contents/Resources/studio.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns studio.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc studio.app/Contents/Resources/studio.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns studio.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@studio_bundle: studio.app/Contents
+@COND_PLATFORM_MACOSX_1@studio_bundle: studio.app/Contents/PkgInfo
 
 studio_cspalette.o: $(srcdir)/cspalette.cpp
        $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
@@ -187,7 +199,7 @@ studio_studio.o: $(srcdir)/studio.cpp
        $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
 studio_studio_rc.o: $(srcdir)/studio.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include
 
 studio_symbols.o: $(srcdir)/symbols.cpp
        $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<