makefiles update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -16,10 +16,14 @@ EXEEXT = @EXEEXT@
|
||||
RESCOMP = @RESCOMP@
|
||||
SETFILE = @SETFILE@
|
||||
PIC_FLAG = @PIC_FLAG@
|
||||
STRIP = @STRIP@
|
||||
NM = @NM@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DIR = @INSTALL_DIR@
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
top_builddir = @top_builddir@
|
||||
libdir = @libdir@
|
||||
DLLPREFIX_MODULE = @DLLPREFIX_MODULE@
|
||||
LDFLAGS_GUI = @LDFLAGS_GUI@
|
||||
CXX = @CXX@
|
||||
@@ -41,6 +45,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
DESTDIR =
|
||||
WX_VERSION = 2.5.1
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
|
||||
RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
|
||||
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
RENDER_OBJECTS = \
|
||||
@@ -64,8 +69,14 @@ RENDDLL_OBJECTS = \
|
||||
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
|
||||
@COND_UNICODE_1@WXUNICODEFLAG = u
|
||||
@COND_WXUNIV_1@WXUNIVNAME = univ
|
||||
@COND_PLATFORM_UNIX_0@PLUGIN_VERSION = 251
|
||||
@COND_PLATFORM_UNIX_1@PLUGIN_VERSION = -2.5.1
|
||||
@COND_PLATFORM_UNIX_0@PLUGIN_VERSION0 = 251
|
||||
@COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = 2.5.1
|
||||
@COND_PLATFORM_UNIX_0@PLUGVERDELIM =
|
||||
@COND_PLATFORM_UNIX_1@PLUGVERDELIM = -
|
||||
@COND_BUILD_RELEASE_UNICODE_0@PLUGINSUFFIX =
|
||||
@COND_BUILD_DEBUG_UNICODE_0@PLUGINSUFFIX = _d
|
||||
@COND_BUILD_RELEASE_UNICODE_1@PLUGINSUFFIX = _u
|
||||
@COND_BUILD_DEBUG_UNICODE_1@PLUGINSUFFIX = _ud
|
||||
@COND_PLATFORM_MAC_1@__render___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C render$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_1@__render___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@@ -82,8 +93,9 @@ COND_PLATFORM_OS2_1___render___os2_emxbindcmd = $(NM) render$(EXEEXT) | if grep
|
||||
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
|
||||
@COND_PLATFORM_MACOSX_1@__render_bundle___depname = render_bundle
|
||||
COND_SHARED_1___renddll___depname = \
|
||||
$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGIN_VERSION)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
|
||||
$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
|
||||
@COND_SHARED_1@__renddll___depname = $(COND_SHARED_1___renddll___depname)
|
||||
@COND_SHARED_1@__install_renddll___depname = install_renddll
|
||||
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
|
||||
$(srcdir)/../../samples -o render$(EXEEXT) Carbon.r \
|
||||
@@ -120,18 +132,19 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
|
||||
all: render$(EXEEXT) $(__render_bundle___depname) $(__renddll___depname)
|
||||
|
||||
install: all
|
||||
install: all $(__install_renddll___depname)
|
||||
|
||||
uninstall:
|
||||
|
||||
install-strip: install
|
||||
$(STRIP) $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f render$(EXEEXT)
|
||||
rm -rf render.app
|
||||
rm -f $(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGIN_VERSION)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
|
||||
rm -f $(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
|
||||
|
||||
distclean: clean
|
||||
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
@@ -166,9 +179,13 @@ render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@render_bundle: render.app/Contents/PkgInfo
|
||||
|
||||
@COND_SHARED_1@$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGIN_VERSION)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(RENDDLL_OBJECTS)
|
||||
@COND_SHARED_1@$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(RENDDLL_OBJECTS)
|
||||
@COND_SHARED_1@ $(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__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)
|
||||
|
||||
@COND_SHARED_1@install_renddll:
|
||||
@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)
|
||||
@COND_SHARED_1@ $(INSTALL_PROGRAM) $(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) $(DESTDIR)$(PLUGINS_INST_DIR)
|
||||
|
||||
render_sample_rc.o: $(srcdir)/../../samples/sample.rc
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
|
||||
|
||||
@@ -182,4 +199,4 @@ renddll_renddll.o: $(srcdir)/renddll.cpp
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
.PHONY: all install uninstall clean distclean render_bundle
|
||||
.PHONY: all install uninstall clean distclean render_bundle install_renddll
|
||||
|
Reference in New Issue
Block a user