regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -14,13 +14,9 @@ AR = @AR@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
DLLPREFIX = @DLLPREFIX@
|
||||
EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_DIR = @INSTALL_DIR@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LN_S = @LN_S@
|
||||
PIC_FLAG = @PIC_FLAG@
|
||||
@@ -56,10 +52,6 @@ WX_VERSION = 2.5.0
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
|
||||
@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
|
||||
@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
|
||||
@@ -105,42 +97,42 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
@COND_GCC_PCH_1@__plotdll_PCH_DEP = .pch/wxprec_plotdll/wx/wxprec.h.gch
|
||||
@COND_GCC_PCH_1@__plotdll_PCH_INC = -I.pch/wxprec_plotdll
|
||||
COND_SHARED_1___plotdll___depname = \
|
||||
$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
|
||||
$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
|
||||
@COND_SHARED_1@__plotdll___depname = $(COND_SHARED_1___plotdll___depname)
|
||||
COND_PLATFORM_WIN32_1___plotdll___importlib = \
|
||||
-Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
|
||||
-Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).$(SO_SUFFIX)
|
||||
@COND_PLATFORM_WIN32_1@__plotdll___importlib = $(COND_PLATFORM_WIN32_1___plotdll___importlib)
|
||||
COND_PLATFORM_MACOSX_1___plotdll___macinstnamecmd = -install_name \
|
||||
$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2)
|
||||
$(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2)
|
||||
@COND_PLATFORM_MACOSX_1@__plotdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___plotdll___macinstnamecmd)
|
||||
@COND_PLATFORM_MACOSX_1@__plotdll___macver = \
|
||||
@COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \
|
||||
@COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION)
|
||||
COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
|
||||
libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
|
||||
$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \
|
||||
libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \
|
||||
lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \
|
||||
$(LN_S) \
|
||||
$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) \
|
||||
$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \
|
||||
lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) \
|
||||
lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \
|
||||
$(LN_S) \
|
||||
$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) \
|
||||
libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT))
|
||||
lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) \
|
||||
libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).$(SO_SUFFIX))
|
||||
@COND_USE_SOSYMLINKS_1@__plotdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_cmd)
|
||||
COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_inst_cmd = rm -f \
|
||||
libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
|
||||
$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \
|
||||
libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \
|
||||
lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \
|
||||
$(LN_S) \
|
||||
$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) \
|
||||
$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \
|
||||
lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) \
|
||||
lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \
|
||||
$(LN_S) \
|
||||
$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) \
|
||||
libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
|
||||
lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) \
|
||||
libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).$(SO_SUFFIX)
|
||||
@COND_USE_SOSYMLINKS_1@__plotdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_inst_cmd)
|
||||
COND_USE_SOVERLINUX_1___plotdll___soname_flags = \
|
||||
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2)
|
||||
$(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2)
|
||||
@COND_USE_SOVERLINUX_1@__plotdll___soname_flags = $(COND_USE_SOVERLINUX_1___plotdll___soname_flags)
|
||||
COND_USE_SOVERSOLARIS_1___plotdll___soname_flags = \
|
||||
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
|
||||
$(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
|
||||
@COND_USE_SOVERSOLARIS_1@__plotdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___plotdll___soname_flags)
|
||||
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__plotdll___targetsuf2 \
|
||||
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0
|
||||
@@ -171,42 +163,42 @@ all: $(__plotdll___depname) $(__plotlib___depname)
|
||||
clean:
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
|
||||
rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
|
||||
rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2)
|
||||
rm -f $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
|
||||
rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).$(SO_SUFFIX)
|
||||
rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2)
|
||||
rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a
|
||||
|
||||
distclean: clean
|
||||
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
||||
install: all $(__install_plotdll___depname) $(__install_plotlib___depname)
|
||||
$(INSTALL_DIR) $(includedir)
|
||||
$(INSTALL) -d $(includedir)
|
||||
for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; do \
|
||||
if test ! -d $(includedir)/`dirname $$f` ; then \
|
||||
$(INSTALL_DIR) $(includedir)/`dirname $$f`; \
|
||||
$(INSTALL) -d $(includedir)/`dirname $$f`; \
|
||||
fi; \
|
||||
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(includedir)/$$f; \
|
||||
$(INSTALL) -m 644 $(srcdir)/../../include//$$f $(includedir)/$$f; \
|
||||
done
|
||||
|
||||
install-strip: install
|
||||
$(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
|
||||
$(STRIP) $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
|
||||
|
||||
@COND_SHARED_1@install_plotdll:
|
||||
@COND_SHARED_1@ $(INSTALL_DIR) $(libdir)
|
||||
@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
|
||||
@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) $(libdir)
|
||||
@COND_SHARED_1@ $(INSTALL) -d $(libdir)
|
||||
@COND_SHARED_1@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(libdir)
|
||||
@COND_SHARED_1@ install -c $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) $(libdir)
|
||||
@COND_SHARED_1@ (cd $(libdir) ; $(__plotdll___so_symlinks_inst_cmd))
|
||||
|
||||
@COND_SHARED_0@install_plotlib:
|
||||
@COND_SHARED_0@ $(INSTALL_DIR) $(libdir)
|
||||
@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a $(libdir)
|
||||
@COND_SHARED_0@ $(INSTALL) -d $(libdir)
|
||||
@COND_SHARED_0@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a $(libdir)
|
||||
|
||||
@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3): $(__plotdll_PCH_DEP) $(PLOTDLL_OBJECTS)
|
||||
@COND_SHARED_1@$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3): $(__plotdll_PCH_DEP) $(PLOTDLL_OBJECTS)
|
||||
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(__plotdll___soname_flags) $(__plotdll___macver) $(__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) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
|
||||
@COND_SHARED_1@ $(__plotdll___so_symlinks_cmd)
|
||||
|
||||
plotdll_plot.o: $(srcdir)/plot.cpp
|
||||
$(CXXC) -c -o $@ $(PLOTDLL_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(PLOTDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a: $(__plotlib_PCH_DEP) $(PLOTLIB_OBJECTS)
|
||||
@COND_SHARED_0@ rm -f $@
|
||||
@@ -214,7 +206,7 @@ plotdll_plot.o: $(srcdir)/plot.cpp
|
||||
@COND_SHARED_0@ $(RANLIB) $@
|
||||
|
||||
plotlib_plot.o: $(srcdir)/plot.cpp
|
||||
$(CXXC) -c -o $@ $(PLOTLIB_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(PLOTLIB_CXXFLAGS) $<
|
||||
|
||||
uninstall:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user