Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various fixes to contrib bakefiles. Regenerated corresponding

Browse Source 
Makefile.in.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-09-12 21:49:46 +00:00
parent d1cc09bb6f
commit 9fd04ddee8
8 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
autoconf_inc.m4
View File

@@ -2,6 +2,9 @@ dnl This macro was generated by
dnl Bakefile 0.1.1 (http://bakefile.sourceforge.net) dnl Bakefile 0.1.1 (http://bakefile.sourceforge.net)
dnl Do not modify, all changes will be overwritten! dnl Do not modify, all changes will be overwritten!
dnl Conditions:
dnl ### begin block 0_AC_BAKEFILE_PRECOMP_HEADERS ### dnl ### begin block 0_AC_BAKEFILE_PRECOMP_HEADERS ###
AC_BAKEFILE_PRECOMP_HEADERS AC_BAKEFILE_PRECOMP_HEADERS

2
contrib/samples/Makefile.in
View File

@@ -1,6 +1,6 @@
# $Id$ # $Id$
CONTRIB_SAMPLES=fl gizmos mmedia net ogl plot stc svg xrc deprecated #applet CONTRIB_SAMPLES=fl gizmos mmedia ogl plot stc svg xrc deprecated #applet net
all: all:
@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done @for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done

3
contrib/samples/mmedia/Makefile.in
View File

@@ -15,6 +15,7 @@ CXX = @CXX@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXTRALIBS = @EXTRALIBS@ EXTRALIBS = @EXTRALIBS@
EXTRALIBS_ESD = @EXTRALIBS_ESD@
EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
HOST_SUFFIX = @HOST_SUFFIX@ HOST_SUFFIX = @HOST_SUFFIX@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@@ -115,7 +116,7 @@ install: all
install-strip: install install-strip: install
mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc) mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc)
$(CXX) -o $@ $(MMBOARD_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX) $(__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 $@ $(MMBOARD_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX) $(EXTRALIBS_ESD) $(__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)
$(__mmboard___mac_rezcmd) $(__mmboard___mac_rezcmd)
$(__mmboard___mac_setfilecmd) $(__mmboard___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK) $(SAMPLES_RPATH_POSTLINK)

5
contrib/samples/mmedia/mmboard.bkl
View File

@@ -4,12 +4,17 @@
<include file="../../../build/bakefiles/common_samples.bkl"/> <include file="../../../build/bakefiles/common_samples.bkl"/>
<include file="../../../build/bakefiles/common_contrib.bkl"/> <include file="../../../build/bakefiles/common_contrib.bkl"/>
<if cond="FORMAT=='autoconf'">
<option name="EXTRALIBS_ESD"/>
</if>
<exe id="mmboard" template="wx_contrib_sample" template_append="wx_append"> <exe id="mmboard" template="wx_contrib_sample" template_append="wx_append">
<sources> <sources>
mmboard.cpp mmboard.cpp
mmbman.cpp mmbman.cpp
</sources> </sources>
<wx-lib>mmedia</wx-lib> <wx-lib>mmedia</wx-lib>
<ldlibs cond="FORMAT=='autoconf'">$(EXTRALIBS_ESD)</ldlibs>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>mmboard.rc</win32-res> <win32-res>mmboard.rc</win32-res>

5
contrib/samples/ogl/studio/Makefile.in
View File

@@ -96,6 +96,9 @@ COND_MONOLITHIC_0___WXLIB_ADV_p = \
COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_CORE_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) -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_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 = \ COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -134,7 +137,7 @@ install: all
install-strip: install install-strip: install
studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc) 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) $(__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_rezcmd)
$(__studio___mac_setfilecmd) $(__studio___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK) $(SAMPLES_RPATH_POSTLINK)

1
contrib/samples/ogl/studio/studio.bkl
View File

@@ -21,6 +21,7 @@
<wx-lib>ogl</wx-lib> <wx-lib>ogl</wx-lib>
<wx-lib>deprecated</wx-lib> <wx-lib>deprecated</wx-lib>
<wx-lib>adv</wx-lib> <wx-lib>adv</wx-lib>
<wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>studio.rc</win32-res> <win32-res>studio.rc</win32-res>

6
contrib/samples/xrc/Makefile.in
View File

@@ -16,6 +16,7 @@ CXXFLAGS = @CXXFLAGS@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXTRALIBS = @EXTRALIBS@ EXTRALIBS = @EXTRALIBS@
EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
EXTRALIBS_XML = @EXTRALIBS_XML@
HOST_SUFFIX = @HOST_SUFFIX@ HOST_SUFFIX = @HOST_SUFFIX@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LDFLAGS_GUI = @LDFLAGS_GUI@ LDFLAGS_GUI = @LDFLAGS_GUI@
@@ -82,6 +83,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
xrcdemo$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ xrcdemo$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
sample.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @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)
@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_CORE_p = \
@@ -132,7 +136,7 @@ install-strip: install
uninstall: uninstall:
xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
$(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_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 $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
$(__xrcdemo___mac_rezcmd) $(__xrcdemo___mac_rezcmd)
$(__xrcdemo___mac_setfilecmd) $(__xrcdemo___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK) $(SAMPLES_RPATH_POSTLINK)

6
samples/xrc/Makefile.in
View File

@@ -16,6 +16,7 @@ CXXFLAGS = @CXXFLAGS@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXTRALIBS = @EXTRALIBS@ EXTRALIBS = @EXTRALIBS@
EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
EXTRALIBS_XML = @EXTRALIBS_XML@
HOST_SUFFIX = @HOST_SUFFIX@ HOST_SUFFIX = @HOST_SUFFIX@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LDFLAGS_GUI = @LDFLAGS_GUI@ LDFLAGS_GUI = @LDFLAGS_GUI@
@@ -82,6 +83,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
xrcdemo$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ xrcdemo$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
sample.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @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)
@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_CORE_p = \
@@ -132,7 +136,7 @@ install-strip: install
uninstall: uninstall:
xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
$(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_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 $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
$(__xrcdemo___mac_rezcmd) $(__xrcdemo___mac_rezcmd)
$(__xrcdemo___mac_setfilecmd) $(__xrcdemo___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK) $(SAMPLES_RPATH_POSTLINK)