fix sizing of extra control

[wxWidgets.git] / samples / joytest / Makefile.in

diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in
index 6d9b54ffb50a5e7e022a156d5b6a14f3e72d61b8..5076772ab588fc08b9b8d1ccabe6fdba00d1648b 100644 (file)
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -100,11 +100,13 @@ COND_PLATFORM_OS2_1___joytest___os2_emxbindcmd = $(NM) joytest$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__joytest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__joytest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@       = joytest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__joytest_bundle___depname = joytest_bundle
 @COND_TOOLKIT_COCOA@____joytest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   joytest.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@   $(__joytest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____joytest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     joytest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@     $(__joytest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -173,25 +175,25 @@ joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc)
        $(__joytest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-       mkdir -p joytest.app/Contents
-       mkdir -p joytest.app/Contents/MacOS
-       mkdir -p joytest.app/Contents/Resources
-       
-       
-       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-       -e "s/EXECUTABLE/joytest/" \
-       -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/carbon/Info.plist.in >joytest.app/Contents/Info.plist
-       
-       
-       echo -n "APPL????" >joytest.app/Contents/PkgInfo
-       
-       
-       ln -f joytest$(EXEEXT) joytest.app/Contents/MacOS/joytest
-       
-       
-       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns joytest.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       mkdir -p joytest.app/Contents
+@COND_PLATFORM_MACOSX_1@       mkdir -p joytest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@       mkdir -p joytest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/joytest/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >joytest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >joytest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       ln -f joytest$(EXEEXT) joytest.app/Contents/MacOS/joytest
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns joytest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@joytest_bundle: $(____joytest_BUNDLE_TGT_REF_DEP)