Create a wrapper file for X11/XKBlib.h header.

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

diff --git a/samples/dll/Makefile.in b/samples/dll/Makefile.in
index 30fa08870fe551ac4d7b00411ff706db710f43f1..6b6259b827d521cbc2a305eb75e03cb17bbb5005 100644 (file)
--- a/samples/dll/Makefile.in
+++ b/samples/dll/Makefile.in
@@ -36,6 +36,7 @@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@

+EXTRALIBS_XML = @EXTRALIBS_XML@

 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@


@@ -46,7 +47,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
 
 DESTDIR = 
 WX_RELEASE = 2.9

-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4

 LIBDIRNAME = $(wx_top_builddir)/lib
 MY_DLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 LIBDIRNAME = $(wx_top_builddir)/lib
 MY_DLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \


@@ -77,7 +78,8 @@ SDK_EXE_OBJECTS =  \
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)

-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+@COND_MONOLITHIC_1@    $(EXTRALIBS_XML) $(EXTRALIBS_GUI)

 @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 @COND_PLATFORM_WIN32_1@__my_dll___depname = $(DLLPREFIX)my_dll.$(SO_SUFFIX)
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 @COND_PLATFORM_WIN32_1@__my_dll___depname = $(DLLPREFIX)my_dll.$(SO_SUFFIX)


@@ -200,7 +202,7 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@     $(top_srcdir)/src/osx/carbon/Info.plist.in >wx_exe.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@     
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@     
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@     $(top_srcdir)/src/osx/carbon/Info.plist.in >wx_exe.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@     
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@     

-@COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@     echo -n "APPL????" >wx_exe.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@     /bin/echo "APPL????" >wx_exe.app/Contents/PkgInfo

 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@     
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@     
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@     ln -f wx_exe$(EXEEXT) wx_exe.app/Contents/MacOS/wx_exe
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@     
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@     
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@     ln -f wx_exe$(EXEEXT) wx_exe.app/Contents/MacOS/wx_exe