projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied patch [ 853031 ] Japanese po file
[wxWidgets.git]
/
samples
/
validate
/
Makefile.in
diff --git
a/samples/validate/Makefile.in
b/samples/validate/Makefile.in
index df6ff7b936a0beef1c4beba8298af47872a19bc4..c96e7471c045df58bbe840bfb4bf34437f93d7db 100644
(file)
--- a/
samples/validate/Makefile.in
+++ b/
samples/validate/Makefile.in
@@
-19,6
+19,7
@@
EXTRALIBS_GUI = @EXTRALIBS_GUI@
HOST_SUFFIX = @HOST_SUFFIX@
LDFLAGS = @LDFLAGS@
LDFLAGS_GUI = @LDFLAGS_GUI@
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@
RESCOMP = @RESCOMP@
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@
-33,14
+34,15
@@
top_srcdir = @top_srcdir@
### Variables: ###
### Variables: ###
+DESTDIR =
LIBDIRNAME = $(top_builddir)lib
LIBDIRNAME = $(top_builddir)lib
-VALIDATE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
- -I$(srcdir)/../../samples $(CXXFLAGS)
+VALIDATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+ $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
VALIDATE_OBJECTS = \
VALIDATE_OBJECTS = \
+ $(__validate_os2_lib_res) \
validate_validate.o \
$(__validate___win32rc)
validate_validate.o \
$(__validate___win32rc)
-WX_VERSION = 2.5.
0
+WX_VERSION = 2.5.
1
### Conditionally set variables: ###
### Conditionally set variables: ###
@@
-74,9
+76,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 \
@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 -o validate$(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 -o validate$(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_BASE_p = \
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@
-92,8
+94,13
@@
COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_PLATFORM_MAC_1@__validate___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@COND_PLATFORM_MAC_1@__validate___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C validate$(EXEEXT)
@COND_PLATFORM_MAC_1@__validate___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@COND_PLATFORM_MAC_1@__validate___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C validate$(EXEEXT)
+COND_PLATFORM_OS2_1___validate___os2_emxbindcmd = $(NM) validate$(EXEEXT) | if \
+ grep -q pmwin.763 ; then emxbind -ep validate$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__validate___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___validate___os2_emxbindcmd)
@COND_PLATFORM_WIN32_1@__validate___win32rc = validate_validate_rc.o
@COND_PLATFORM_MACOSX_1@__validate_bundle___depname = validate_bundle
@COND_PLATFORM_WIN32_1@__validate___win32rc = validate_validate_rc.o
@COND_PLATFORM_MACOSX_1@__validate_bundle___depname = validate_bundle
+@COND_PLATFORM_OS2_1@__validate_os2_lib_res = \
+@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
### Targets: ###
### Targets: ###
@@
-115,12
+122,13
@@
install-strip: install
uninstall:
validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc)
uninstall:
validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc)
- $(CXX) -o $@ $(VALIDATE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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 $@ $(VALIDATE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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)
$(__validate___mac_rezcmd)
$(__validate___mac_setfilecmd)
$(__validate___mac_rezcmd)
$(__validate___mac_setfilecmd)
+ $(__validate___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
$(SAMPLES_RPATH_POSTLINK)
-validate.app/Contents
: validate$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0
.rsrc $(top_srcdir)/src/mac/wxmac.icns
+validate.app/Contents
/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1
.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p validate.app/Contents
mkdir -p validate.app/Contents/MacOS
mkdir -p validate.app/Contents/Resources
mkdir -p validate.app/Contents
mkdir -p validate.app/Contents/MacOS
mkdir -p validate.app/Contents/Resources
@@
-138,16
+146,16
@@
validate.app/Contents: validate$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
ln -f validate$(EXEEXT) validate.app/Contents/MacOS/validate
ln -f validate$(EXEEXT) validate.app/Contents/MacOS/validate
- ln -
f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0
.rsrc validate.app/Contents/Resources/validate.rsrc
- ln -f $(top_srcdir)/src/mac/wxmac.icns validate.app/Contents/Resources/wxmac.icns
+ ln -
sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1
.rsrc validate.app/Contents/Resources/validate.rsrc
+ ln -
s
f $(top_srcdir)/src/mac/wxmac.icns validate.app/Contents/Resources/wxmac.icns
-@COND_PLATFORM_MACOSX_1@validate_bundle: validate.app/Contents
+@COND_PLATFORM_MACOSX_1@validate_bundle: validate.app/Contents
/PkgInfo
validate_validate.o: $(srcdir)/validate.cpp
$(CXXC) -c -o $@ $(VALIDATE_CXXFLAGS) $<
validate_validate_rc.o: $(srcdir)/validate.rc
validate_validate.o: $(srcdir)/validate.cpp
$(CXXC) -c -o $@ $(VALIDATE_CXXFLAGS) $<
validate_validate_rc.o: $(srcdir)/validate.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
+ $(RESCOMP) -i$< -o$@
--define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)
--include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
# Include dependency info, if present:
# Include dependency info, if present: