From e8f60bac1ab18be00b4e433f5db7b0261c5f17da Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 22 Aug 2003 21:02:44 +0000 Subject: [PATCH] regenerated makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 36 +++ build/msw/makefile.bcc | 73 +++-- build/msw/makefile.gcc | 71 +++-- build/msw/makefile.vc | 66 ++++- build/msw/makefile.wat | 90 ++++-- build/msw/wx_base.dsp | 16 ++ contrib/samples/animate/Makefile.in | 21 +- .../samples/deprecated/proplist/Makefile.in | 20 +- .../samples/deprecated/resource/Makefile.in | 20 +- .../samples/deprecated/treelay/Makefile.in | 20 +- contrib/samples/fl/Makefile.in | 77 +++-- contrib/samples/gizmos/dynsash/Makefile.in | 20 +- .../samples/gizmos/dynsash_switch/Makefile.in | 19 +- contrib/samples/gizmos/editlbox/Makefile.in | 20 +- contrib/samples/gizmos/led/Makefile.in | 19 +- contrib/samples/gizmos/multicell/Makefile.in | 20 +- contrib/samples/gizmos/splittree/Makefile.in | 19 +- contrib/samples/mmedia/Makefile.in | 23 +- contrib/samples/ogl/ogledit/Makefile.in | 26 +- contrib/samples/ogl/studio/Makefile.in | 38 ++- contrib/samples/ogl/studio/makefile.wat | 2 +- contrib/samples/plot/Makefile.in | 20 +- contrib/samples/stc/Makefile.in | 21 +- contrib/samples/svg/Makefile.in | 21 +- contrib/samples/xrc/Makefile.in | 27 +- contrib/src/animate/Makefile.in | 72 +++-- contrib/src/deprecated/Makefile.in | 102 +++---- contrib/src/fl/Makefile.in | 136 +++++---- contrib/src/gizmos/Makefile.in | 92 +++--- contrib/src/mmedia/Makefile.in | 164 ++++++----- contrib/src/net/Makefile.in | 80 +++--- contrib/src/ogl/Makefile.in | 116 ++++---- contrib/src/plot/Makefile.in | 72 +++-- contrib/src/stc/Makefile.in | 264 +++++++++--------- contrib/src/svg/Makefile.in | 72 +++-- contrib/src/xrc/Makefile.in | 216 +++++++------- contrib/utils/wxrc/Makefile.in | 22 +- demos/bombs/Makefile.in | 24 +- demos/dbbrowse/Makefile.in | 34 +-- demos/forty/Makefile.in | 34 +-- demos/fractal/Makefile.in | 20 +- demos/life/Makefile.in | 26 +- demos/poem/Makefile.in | 20 +- samples/access/Makefile.in | 19 +- samples/artprov/Makefile.in | 22 +- samples/calendar/Makefile.in | 20 +- samples/caret/Makefile.in | 20 +- samples/checklst/Makefile.in | 20 +- samples/config/Makefile.in | 20 +- samples/console/Makefile.in | 13 +- samples/controls/Makefile.in | 20 +- samples/db/Makefile.in | 22 +- samples/dialogs/Makefile.in | 20 +- samples/dialup/Makefile.in | 20 +- samples/display/Makefile.in | 20 +- samples/dnd/Makefile.in | 19 +- samples/docview/Makefile.in | 26 +- samples/docvwmdi/Makefile.in | 24 +- samples/dragimag/Makefile.in | 20 +- samples/drawing/Makefile.in | 20 +- samples/dynamic/Makefile.in | 20 +- samples/erase/Makefile.in | 20 +- samples/event/Makefile.in | 20 +- samples/exec/Makefile.in | 20 +- samples/font/Makefile.in | 20 +- samples/grid/Makefile.in | 20 +- samples/help/Makefile.in | 20 +- samples/htlbox/Makefile.in | 20 +- samples/html/about/Makefile.in | 20 +- samples/html/help/Makefile.in | 20 +- samples/html/helpview/Makefile.in | 20 +- samples/html/printing/Makefile.in | 20 +- samples/html/test/Makefile.in | 20 +- samples/html/virtual/Makefile.in | 20 +- samples/html/widget/Makefile.in | 20 +- samples/html/zip/Makefile.in | 19 +- samples/image/Makefile.in | 20 +- samples/internat/Makefile.in | 20 +- samples/ipc/Makefile.in | 35 +-- samples/joytest/Makefile.in | 20 +- samples/keyboard/Makefile.in | 20 +- samples/layout/Makefile.in | 20 +- samples/listbox/Makefile.in | 20 +- samples/listctrl/Makefile.in | 20 +- samples/mdi/Makefile.in | 19 +- samples/memcheck/Makefile.in | 20 +- samples/menu/Makefile.in | 20 +- samples/mfc/Makefile.in | 20 +- samples/minifram/Makefile.in | 20 +- samples/minimal/Makefile.in | 20 +- samples/mobile/styles/Makefile.in | 20 +- samples/mobile/wxedit/Makefile.in | 20 +- samples/multimon/Makefile.in | 21 +- samples/nativdlg/Makefile.in | 20 +- samples/notebook/Makefile.in | 20 +- samples/oleauto/Makefile.in | 20 +- samples/opengl/cube/Makefile.in | 20 +- samples/opengl/isosurf/Makefile.in | 20 +- samples/opengl/penguin/Makefile.in | 26 +- samples/ownerdrw/Makefile.in | 20 +- samples/png/Makefile.in | 19 +- samples/printing/Makefile.in | 20 +- samples/propsize/Makefile.in | 20 +- samples/regtest/Makefile.in | 20 +- samples/render/Makefile.in | 29 +- samples/richedit/Makefile.in | 28 +- samples/rotate/Makefile.in | 20 +- samples/sashtest/Makefile.in | 20 +- samples/scroll/Makefile.in | 20 +- samples/scrollsub/Makefile.in | 19 +- samples/shaped/Makefile.in | 20 +- samples/sockets/Makefile.in | 35 +-- samples/splitter/Makefile.in | 20 +- samples/statbar/Makefile.in | 20 +- samples/stc/Makefile.in | 21 +- samples/svg/Makefile.in | 21 +- samples/tab/Makefile.in | 19 +- samples/taskbar/Makefile.in | 20 +- samples/text/Makefile.in | 20 +- samples/thread/Makefile.in | 20 +- samples/toolbar/Makefile.in | 20 +- samples/treectrl/Makefile.in | 20 +- samples/typetest/Makefile.in | 20 +- samples/validate/Makefile.in | 20 +- samples/vscroll/Makefile.in | 20 +- samples/widgets/Makefile.in | 40 ++- samples/wizard/Makefile.in | 20 +- samples/wxtest/Makefile.in | 22 +- samples/xrc/Makefile.in | 27 +- src/stc/Makefile.in | 264 +++++++++--------- src/xrc/Makefile.in | 216 +++++++------- utils/HelpGen/Makefile.in | 27 +- utils/configtool/src/Makefile.in | 43 ++- utils/emulator/src/Makefile.in | 17 +- utils/helpview/src/Makefile.in | 24 +- utils/tex2rtf/src/Makefile.in | 67 ++--- utils/wxrc/Makefile.in | 22 +- 137 files changed, 2233 insertions(+), 2623 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9161d34b40..ea4817df54 100644 --- a/Makefile.in +++ b/Makefile.in @@ -174,6 +174,8 @@ ALL_BASE_HEADERS = \ wx/wx.h \ wx/wxchar.h \ wx/wxprec.h \ + wx/xti.h \ + wx/xtistrm.h \ wx/zipstrm.h \ wx/zstream.h \ $(BASE_PLATFORM_HDR) \ @@ -242,6 +244,8 @@ ALL_BASE_SOURCES = \ src/common/variant.cpp \ src/common/wfstream.cpp \ src/common/wxchar.cpp \ + src/common/xti.cpp \ + src/common/xtistrm.cpp \ src/common/zipstrm.cpp \ src/common/zstream.cpp \ src/unix/baseunix.cpp \ @@ -360,6 +364,8 @@ BASEDLL_OBJECTS = \ basedll_variant.o \ basedll_wfstream.o \ basedll_wxchar.o \ + basedll_xti.o \ + basedll_xtistrm.o \ basedll_zipstrm.o \ basedll_zstream.o \ $(__BASE_PLATFORM_SRC_OBJECTS_2) \ @@ -426,6 +432,8 @@ BASELIB_OBJECTS = \ baselib_variant.o \ baselib_wfstream.o \ baselib_wxchar.o \ + baselib_xti.o \ + baselib_xtistrm.o \ baselib_zipstrm.o \ baselib_zstream.o \ $(__BASE_PLATFORM_SRC_OBJECTS_3) \ @@ -611,6 +619,8 @@ MONODLL_OBJECTS = \ monodll_variant.o \ monodll_wfstream.o \ monodll_wxchar.o \ + monodll_xti.o \ + monodll_xtistrm.o \ monodll_zipstrm.o \ monodll_zstream.o \ $(__BASE_PLATFORM_SRC_OBJECTS) \ @@ -690,6 +700,8 @@ MONOLIB_OBJECTS = \ monolib_variant.o \ monolib_wfstream.o \ monolib_wxchar.o \ + monolib_xti.o \ + monolib_xtistrm.o \ monolib_zipstrm.o \ monolib_zstream.o \ $(__BASE_PLATFORM_SRC_OBJECTS_1) \ @@ -6495,6 +6507,12 @@ basedll_wfstream.o: $(srcdir)/src/common/wfstream.cpp basedll_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< +basedll_xti.o: $(srcdir)/src/common/xti.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< + +basedll_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< + basedll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6779,6 +6797,12 @@ baselib_wfstream.o: $(srcdir)/src/common/wfstream.cpp baselib_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< +baselib_xti.o: $(srcdir)/src/common/xti.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< + +baselib_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< + baselib_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -13899,6 +13923,12 @@ monodll_xml.o: $(srcdir)/src/xml/xml.cpp @COND_USE_GUI_1@monodll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_xti.o: $(srcdir)/src/common/xti.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +monodll_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -16430,6 +16460,12 @@ monolib_xml.o: $(srcdir)/src/xml/xml.cpp @COND_USE_GUI_1@monolib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_xti.o: $(srcdir)/src/common/xti.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +monolib_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 17137fbbbf..5e5dbf1abc 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -142,7 +142,6 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_thread.obj \ $(OBJS)\basedll_utils.obj \ $(OBJS)\basedll_utilsexc.obj \ - $(OBJS)\basedll_bookctrl.obj \ $(OBJS)\basedll_event.obj \ $(OBJS)\basedll_fs_mem.obj \ $(OBJS)\basedll_msgout.obj \ @@ -226,7 +225,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_thread.obj \ $(OBJS)\baselib_utils.obj \ $(OBJS)\baselib_utilsexc.obj \ - $(OBJS)\baselib_bookctrl.obj \ $(OBJS)\baselib_event.obj \ $(OBJS)\baselib_fs_mem.obj \ $(OBJS)\baselib_msgout.obj \ @@ -248,7 +246,6 @@ COREDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_coredll.csm COREDLL_OBJECTS = \ $(OBJS)\coredll_dummy.obj \ - $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_event.obj \ $(OBJS)\coredll_fs_mem.obj \ $(OBJS)\coredll_msgout.obj \ @@ -270,7 +267,6 @@ CORELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ -H=$(OBJS)\wxprec_corelib.csm CORELIB_OBJECTS = \ $(OBJS)\corelib_dummy.obj \ - $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_event.obj \ $(OBJS)\corelib_fs_mem.obj \ $(OBJS)\corelib_msgout.obj \ @@ -372,14 +368,15 @@ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_m_tables.obj \ $(OBJS)\htmllib_winpars.obj \ $(OBJS)\htmllib_htmllbox.obj -MAKEARGS = -DCPPFLAGS=$(CPPFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) \ - -DLDFLAGS=$(LDFLAGS) -DCC=$(CC) -DUSE_GUI=$(USE_GUI) \ - -DMONOLITHIC=$(MONOLITHIC) -DCXXFLAGS=$(CXXFLAGS) -DUSE_HTML=$(USE_HTML) \ - -DBUILD=$(BUILD) -DDEBUG_INFO=$(DEBUG_INFO) -DVENDOR=$(VENDOR) \ - -DUNICODE=$(UNICODE) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DMSLU=$(MSLU) \ - -DWXUNIV=$(WXUNIV) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DCXX=$(CXX) -DCFG=$(CFG) \ - -DCFLAGS=$(CFLAGS) -DSHARED=$(SHARED) -DUSE_ODBC=$(USE_ODBC) \ - -DUSE_OPENGL=$(USE_OPENGL) +MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ + -DLDFLAGS="$(LDFLAGS)" -DCC="$(CC)" -DUSE_GUI="$(USE_GUI)" \ + -DMONOLITHIC="$(MONOLITHIC)" -DCXXFLAGS="$(CXXFLAGS)" \ + -DUSE_HTML="$(USE_HTML)" -DBUILD="$(BUILD)" -DDEBUG_INFO="$(DEBUG_INFO)" \ + -DVENDOR="$(VENDOR)" -DUNICODE="$(UNICODE)" \ + -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DMSLU="$(MSLU)" -DWXUNIV="$(WXUNIV)" \ + -DRUNTIME_LIBS="$(RUNTIME_LIBS)" -DCXX="$(CXX)" -DCFG="$(CFG)" \ + -DCFLAGS="$(CFLAGS)" -DSHARED="$(SHARED)" -DUSE_ODBC="$(USE_ODBC)" \ + -DUSE_OPENGL="$(USE_OPENGL)" MONODLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ @@ -456,7 +453,6 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_thread.obj \ $(OBJS)\monodll_utils.obj \ $(OBJS)\monodll_utilsexc.obj \ - $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_event.obj \ $(OBJS)\monodll_fs_mem.obj \ $(OBJS)\monodll_msgout.obj \ @@ -553,7 +549,6 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_thread.obj \ $(OBJS)\monolib_utils.obj \ $(OBJS)\monolib_utilsexc.obj \ - $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_event.obj \ $(OBJS)\monolib_fs_mem.obj \ $(OBJS)\monolib_msgout.obj \ @@ -1009,6 +1004,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artprov.obj \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ + $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ $(OBJS)\monolib_cmdproc.obj \ @@ -1080,6 +1076,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ + $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_panelg.obj \ @@ -1201,6 +1198,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artprov.obj \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ + $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ $(OBJS)\monolib_cmdproc.obj \ @@ -1272,6 +1270,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ + $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_panelg.obj \ @@ -1390,6 +1389,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artprov.obj \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ + $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ $(OBJS)\coredll_cmdproc.obj \ @@ -1461,6 +1461,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ + $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_panelg.obj \ @@ -1582,6 +1583,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artprov.obj \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ + $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ $(OBJS)\coredll_cmdproc.obj \ @@ -1653,6 +1655,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ + $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_panelg.obj \ @@ -1771,6 +1774,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artprov.obj \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ + $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ $(OBJS)\corelib_cmdproc.obj \ @@ -1842,6 +1846,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ + $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_panelg.obj \ @@ -1963,6 +1968,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artprov.obj \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ + $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ $(OBJS)\corelib_cmdproc.obj \ @@ -2034,6 +2040,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ + $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_panelg.obj \ @@ -2152,6 +2159,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artprov.obj \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ + $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ $(OBJS)\monodll_cmdproc.obj \ @@ -2223,6 +2231,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ + $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_panelg.obj \ @@ -2344,6 +2353,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artprov.obj \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ + $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ $(OBJS)\monodll_cmdproc.obj \ @@ -2415,6 +2425,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ + $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_panelg.obj \ @@ -2726,9 +2737,6 @@ $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp $(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_bookctrl.obj: ..\..\src\common\bookctrl.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -2942,9 +2950,6 @@ $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp $(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_bookctrl.obj: ..\..\src\common\bookctrl.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -3215,8 +3220,10 @@ $(OBJS)\coredll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\coredll_brush.obj: ..\..\src\msw\brush.cpp @@ -3756,6 +3763,11 @@ $(OBJS)\coredll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -4327,8 +4339,10 @@ $(OBJS)\corelib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\corelib_brush.obj: ..\..\src\msw\brush.cpp @@ -4868,6 +4882,11 @@ $(OBJS)\corelib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -5607,8 +5626,10 @@ $(OBJS)\monodll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp @@ -6310,6 +6331,11 @@ $(OBJS)\monodll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp $(OBJS)\monodll_list.obj: ..\..\src\common\list.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -7064,8 +7090,10 @@ $(OBJS)\monolib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_brush.obj: ..\..\src\msw\brush.cpp @@ -7767,6 +7795,11 @@ $(OBJS)\monolib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp $(OBJS)\monolib_list.obj: ..\..\src\common\list.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 264dded6c8..852e623b95 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -133,7 +133,6 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_thread.o \ $(OBJS)\basedll_utils.o \ $(OBJS)\basedll_utilsexc.o \ - $(OBJS)\basedll_bookctrl.o \ $(OBJS)\basedll_event.o \ $(OBJS)\basedll_fs_mem.o \ $(OBJS)\basedll_msgout.o \ @@ -216,7 +215,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_thread.o \ $(OBJS)\baselib_utils.o \ $(OBJS)\baselib_utilsexc.o \ - $(OBJS)\baselib_bookctrl.o \ $(OBJS)\baselib_event.o \ $(OBJS)\baselib_fs_mem.o \ $(OBJS)\baselib_msgout.o \ @@ -238,7 +236,6 @@ COREDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ $(CXXFLAGS) COREDLL_OBJECTS = \ $(OBJS)\coredll_dummy.o \ - $(OBJS)\coredll_bookctrl.o \ $(OBJS)\coredll_event.o \ $(OBJS)\coredll_fs_mem.o \ $(OBJS)\coredll_msgout.o \ @@ -259,7 +256,6 @@ CORELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -I..\..\src\expat\lib -DwxUSE_BASE=0 $(CXXFLAGS) CORELIB_OBJECTS = \ $(OBJS)\corelib_dummy.o \ - $(OBJS)\corelib_bookctrl.o \ $(OBJS)\corelib_event.o \ $(OBJS)\corelib_fs_mem.o \ $(OBJS)\corelib_msgout.o \ @@ -358,13 +354,14 @@ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_m_tables.o \ $(OBJS)\htmllib_winpars.o \ $(OBJS)\htmllib_htmllbox.o -MAKEARGS = CPPFLAGS=$(CPPFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) LDFLAGS=$(LDFLAGS) \ - CC=$(CC) USE_GUI=$(USE_GUI) MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) \ - GCC_VERSION=$(GCC_VERSION) USE_HTML=$(USE_HTML) BUILD=$(BUILD) \ - DEBUG_INFO=$(DEBUG_INFO) VENDOR=$(VENDOR) UNICODE=$(UNICODE) \ - OFFICIAL_BUILD=$(OFFICIAL_BUILD) MSLU=$(MSLU) WXUNIV=$(WXUNIV) \ - RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) CFLAGS=$(CFLAGS) \ - SHARED=$(SHARED) USE_ODBC=$(USE_ODBC) USE_OPENGL=$(USE_OPENGL) +MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \ + LDFLAGS="$(LDFLAGS)" CC="$(CC)" USE_GUI="$(USE_GUI)" \ + MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \ + GCC_VERSION="$(GCC_VERSION)" USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" \ + DEBUG_INFO="$(DEBUG_INFO)" VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" \ + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" \ + RUNTIME_LIBS="$(RUNTIME_LIBS)" CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" \ + SHARED="$(SHARED)" USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)" MONODLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ @@ -440,7 +437,6 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_thread.o \ $(OBJS)\monodll_utils.o \ $(OBJS)\monodll_utilsexc.o \ - $(OBJS)\monodll_bookctrl.o \ $(OBJS)\monodll_event.o \ $(OBJS)\monodll_fs_mem.o \ $(OBJS)\monodll_msgout.o \ @@ -536,7 +532,6 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_thread.o \ $(OBJS)\monolib_utils.o \ $(OBJS)\monolib_utilsexc.o \ - $(OBJS)\monolib_bookctrl.o \ $(OBJS)\monolib_event.o \ $(OBJS)\monolib_fs_mem.o \ $(OBJS)\monolib_msgout.o \ @@ -989,6 +984,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artprov.o \ $(OBJS)\monolib_artstd.o \ $(OBJS)\monolib_bmpbase.o \ + $(OBJS)\monolib_bookctrl.o \ $(OBJS)\monolib_choiccmn.o \ $(OBJS)\monolib_clipcmn.o \ $(OBJS)\monolib_cmdproc.o \ @@ -1060,6 +1056,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcpsg.o \ $(OBJS)\monolib_dirctrlg.o \ $(OBJS)\monolib_dragimgg.o \ + $(OBJS)\monolib_listbkg.o \ $(OBJS)\monolib_logg.o \ $(OBJS)\monolib_numdlgg.o \ $(OBJS)\monolib_panelg.o \ @@ -1183,6 +1180,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artprov.o \ $(OBJS)\monolib_artstd.o \ $(OBJS)\monolib_bmpbase.o \ + $(OBJS)\monolib_bookctrl.o \ $(OBJS)\monolib_choiccmn.o \ $(OBJS)\monolib_clipcmn.o \ $(OBJS)\monolib_cmdproc.o \ @@ -1254,6 +1252,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcpsg.o \ $(OBJS)\monolib_dirctrlg.o \ $(OBJS)\monolib_dragimgg.o \ + $(OBJS)\monolib_listbkg.o \ $(OBJS)\monolib_logg.o \ $(OBJS)\monolib_numdlgg.o \ $(OBJS)\monolib_panelg.o \ @@ -1374,6 +1373,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artprov.o \ $(OBJS)\coredll_artstd.o \ $(OBJS)\coredll_bmpbase.o \ + $(OBJS)\coredll_bookctrl.o \ $(OBJS)\coredll_choiccmn.o \ $(OBJS)\coredll_clipcmn.o \ $(OBJS)\coredll_cmdproc.o \ @@ -1445,6 +1445,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcpsg.o \ $(OBJS)\coredll_dirctrlg.o \ $(OBJS)\coredll_dragimgg.o \ + $(OBJS)\coredll_listbkg.o \ $(OBJS)\coredll_logg.o \ $(OBJS)\coredll_numdlgg.o \ $(OBJS)\coredll_panelg.o \ @@ -1568,6 +1569,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artprov.o \ $(OBJS)\coredll_artstd.o \ $(OBJS)\coredll_bmpbase.o \ + $(OBJS)\coredll_bookctrl.o \ $(OBJS)\coredll_choiccmn.o \ $(OBJS)\coredll_clipcmn.o \ $(OBJS)\coredll_cmdproc.o \ @@ -1639,6 +1641,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcpsg.o \ $(OBJS)\coredll_dirctrlg.o \ $(OBJS)\coredll_dragimgg.o \ + $(OBJS)\coredll_listbkg.o \ $(OBJS)\coredll_logg.o \ $(OBJS)\coredll_numdlgg.o \ $(OBJS)\coredll_panelg.o \ @@ -1759,6 +1762,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artprov.o \ $(OBJS)\corelib_artstd.o \ $(OBJS)\corelib_bmpbase.o \ + $(OBJS)\corelib_bookctrl.o \ $(OBJS)\corelib_choiccmn.o \ $(OBJS)\corelib_clipcmn.o \ $(OBJS)\corelib_cmdproc.o \ @@ -1830,6 +1834,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcpsg.o \ $(OBJS)\corelib_dirctrlg.o \ $(OBJS)\corelib_dragimgg.o \ + $(OBJS)\corelib_listbkg.o \ $(OBJS)\corelib_logg.o \ $(OBJS)\corelib_numdlgg.o \ $(OBJS)\corelib_panelg.o \ @@ -1953,6 +1958,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artprov.o \ $(OBJS)\corelib_artstd.o \ $(OBJS)\corelib_bmpbase.o \ + $(OBJS)\corelib_bookctrl.o \ $(OBJS)\corelib_choiccmn.o \ $(OBJS)\corelib_clipcmn.o \ $(OBJS)\corelib_cmdproc.o \ @@ -2024,6 +2030,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcpsg.o \ $(OBJS)\corelib_dirctrlg.o \ $(OBJS)\corelib_dragimgg.o \ + $(OBJS)\corelib_listbkg.o \ $(OBJS)\corelib_logg.o \ $(OBJS)\corelib_numdlgg.o \ $(OBJS)\corelib_panelg.o \ @@ -2144,6 +2151,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artprov.o \ $(OBJS)\monodll_artstd.o \ $(OBJS)\monodll_bmpbase.o \ + $(OBJS)\monodll_bookctrl.o \ $(OBJS)\monodll_choiccmn.o \ $(OBJS)\monodll_clipcmn.o \ $(OBJS)\monodll_cmdproc.o \ @@ -2215,6 +2223,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcpsg.o \ $(OBJS)\monodll_dirctrlg.o \ $(OBJS)\monodll_dragimgg.o \ + $(OBJS)\monodll_listbkg.o \ $(OBJS)\monodll_logg.o \ $(OBJS)\monodll_numdlgg.o \ $(OBJS)\monodll_panelg.o \ @@ -2338,6 +2347,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artprov.o \ $(OBJS)\monodll_artstd.o \ $(OBJS)\monodll_bmpbase.o \ + $(OBJS)\monodll_bookctrl.o \ $(OBJS)\monodll_choiccmn.o \ $(OBJS)\monodll_clipcmn.o \ $(OBJS)\monodll_cmdproc.o \ @@ -2409,6 +2419,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcpsg.o \ $(OBJS)\monodll_dirctrlg.o \ $(OBJS)\monodll_dragimgg.o \ + $(OBJS)\monodll_listbkg.o \ $(OBJS)\monodll_logg.o \ $(OBJS)\monodll_numdlgg.o \ $(OBJS)\monodll_panelg.o \ @@ -2789,9 +2800,6 @@ $(OBJS)\basedll_appbase.o: ..\..\src\common\appbase.cpp $(OBJS)\basedll_basemsw.o: ..\..\src\msw\basemsw.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_bookctrl.o: ..\..\src\common\bookctrl.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_clntdata.o: ..\..\src\common\clntdata.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -3005,9 +3013,6 @@ $(OBJS)\baselib_appbase.o: ..\..\src\common\appbase.cpp $(OBJS)\baselib_basemsw.o: ..\..\src\msw\basemsw.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_bookctrl.o: ..\..\src\common\bookctrl.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_clntdata.o: ..\..\src\common\clntdata.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -3286,8 +3291,10 @@ $(OBJS)\coredll_bmpbuttn.o: ..\..\src\msw\bmpbuttn.cpp endif endif +ifeq ($(USE_GUI),1) $(OBJS)\coredll_bookctrl.o: ..\..\src\common\bookctrl.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif ifeq ($(USE_GUI),1) $(OBJS)\coredll_brush.o: ..\..\src\msw\brush.cpp @@ -3863,6 +3870,11 @@ $(OBJS)\coredll_lboxcmn.o: ..\..\src\common\lboxcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_listbkg.o: ..\..\src\generic\listbkg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\coredll_listbox.o: ..\..\src\msw\listbox.cpp @@ -4498,8 +4510,10 @@ $(OBJS)\corelib_bmpbuttn.o: ..\..\src\msw\bmpbuttn.cpp endif endif +ifeq ($(USE_GUI),1) $(OBJS)\corelib_bookctrl.o: ..\..\src\common\bookctrl.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< +endif ifeq ($(USE_GUI),1) $(OBJS)\corelib_brush.o: ..\..\src\msw\brush.cpp @@ -5075,6 +5089,11 @@ $(OBJS)\corelib_lboxcmn.o: ..\..\src\common\lboxcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_listbkg.o: ..\..\src\generic\listbkg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\corelib_listbox.o: ..\..\src\msw\listbox.cpp @@ -5878,8 +5897,10 @@ $(OBJS)\monodll_bmpbuttn.o: ..\..\src\msw\bmpbuttn.cpp endif endif +ifeq ($(USE_GUI),1) $(OBJS)\monodll_bookctrl.o: ..\..\src\common\bookctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif ifeq ($(USE_GUI),1) $(OBJS)\monodll_brush.o: ..\..\src\msw\brush.cpp @@ -6617,6 +6638,11 @@ endif $(OBJS)\monodll_list.o: ..\..\src\common\list.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_listbkg.o: ..\..\src\generic\listbkg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\monodll_listbox.o: ..\..\src\msw\listbox.cpp @@ -7435,8 +7461,10 @@ $(OBJS)\monolib_bmpbuttn.o: ..\..\src\msw\bmpbuttn.cpp endif endif +ifeq ($(USE_GUI),1) $(OBJS)\monolib_bookctrl.o: ..\..\src\common\bookctrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif ifeq ($(USE_GUI),1) $(OBJS)\monolib_brush.o: ..\..\src\msw\brush.cpp @@ -8174,6 +8202,11 @@ endif $(OBJS)\monolib_list.o: ..\..\src\common\list.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_listbkg.o: ..\..\src\generic\listbkg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\monolib_listbox.o: ..\..\src\msw\listbox.cpp diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 819a416e3c..0e7e4f4ef7 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -144,7 +144,6 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_thread.obj \ $(OBJS)\basedll_utils.obj \ $(OBJS)\basedll_utilsexc.obj \ - $(OBJS)\basedll_bookctrl.obj \ $(OBJS)\basedll_event.obj \ $(OBJS)\basedll_fs_mem.obj \ $(OBJS)\basedll_msgout.obj \ @@ -233,7 +232,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_thread.obj \ $(OBJS)\baselib_utils.obj \ $(OBJS)\baselib_utilsexc.obj \ - $(OBJS)\baselib_bookctrl.obj \ $(OBJS)\baselib_event.obj \ $(OBJS)\baselib_fs_mem.obj \ $(OBJS)\baselib_msgout.obj \ @@ -260,7 +258,6 @@ COREDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_105) \ /Fp"$(OBJS)\wxprec_coredll.pch" COREDLL_OBJECTS = \ $(OBJS)\coredll_dummy.obj \ - $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_event.obj \ $(OBJS)\coredll_fs_mem.obj \ $(OBJS)\coredll_msgout.obj \ @@ -287,7 +284,6 @@ CORELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_114) \ /DwxUSE_BASE=0 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_corelib.pch" CORELIB_OBJECTS = \ $(OBJS)\corelib_dummy.obj \ - $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_event.obj \ $(OBJS)\corelib_fs_mem.obj \ $(OBJS)\corelib_msgout.obj \ @@ -407,6 +403,14 @@ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_m_tables.obj \ $(OBJS)\htmllib_winpars.obj \ $(OBJS)\htmllib_htmllbox.obj +MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \ + LDFLAGS="$(LDFLAGS)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" CC="$(CC)" \ + USE_GUI="$(USE_GUI)" MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \ + USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" DEBUG_INFO="$(DEBUG_INFO)" \ + VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \ + MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \ + CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" SHARED="$(SHARED)" \ + USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)" MONODLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_51) /DWIN32 \ $(__DEBUGINFO_36) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ @@ -488,7 +492,6 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_thread.obj \ $(OBJS)\monodll_utils.obj \ $(OBJS)\monodll_utilsexc.obj \ - $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_event.obj \ $(OBJS)\monodll_fs_mem.obj \ $(OBJS)\monodll_msgout.obj \ @@ -589,7 +592,6 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_thread.obj \ $(OBJS)\monolib_utils.obj \ $(OBJS)\monolib_utilsexc.obj \ - $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_event.obj \ $(OBJS)\monolib_fs_mem.obj \ $(OBJS)\monolib_msgout.obj \ @@ -1323,6 +1325,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artprov.obj \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ + $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ $(OBJS)\monolib_cmdproc.obj \ @@ -1394,6 +1397,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ + $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_panelg.obj \ @@ -1515,6 +1519,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artprov.obj \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ + $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ $(OBJS)\monolib_cmdproc.obj \ @@ -1586,6 +1591,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ + $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_panelg.obj \ @@ -1704,6 +1710,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artprov.obj \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ + $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ $(OBJS)\coredll_cmdproc.obj \ @@ -1775,6 +1782,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ + $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_panelg.obj \ @@ -1896,6 +1904,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artprov.obj \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ + $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ $(OBJS)\coredll_cmdproc.obj \ @@ -1967,6 +1976,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ + $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_panelg.obj \ @@ -2085,6 +2095,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artprov.obj \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ + $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ $(OBJS)\corelib_cmdproc.obj \ @@ -2156,6 +2167,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ + $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_panelg.obj \ @@ -2277,6 +2289,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artprov.obj \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ + $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ $(OBJS)\corelib_cmdproc.obj \ @@ -2348,6 +2361,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ + $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_panelg.obj \ @@ -2466,6 +2480,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artprov.obj \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ + $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ $(OBJS)\monodll_cmdproc.obj \ @@ -2537,6 +2552,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ + $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_panelg.obj \ @@ -2658,6 +2674,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artprov.obj \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ + $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ $(OBJS)\monodll_cmdproc.obj \ @@ -2729,6 +2746,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ + $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_panelg.obj \ @@ -3286,9 +3304,6 @@ $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp $(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_bookctrl.obj: ..\..\src\common\bookctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -3502,9 +3517,6 @@ $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp $(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_bookctrl.obj: ..\..\src\common\bookctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -3775,8 +3787,10 @@ $(OBJS)\coredll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\coredll_brush.obj: ..\..\src\msw\brush.cpp @@ -4316,6 +4330,11 @@ $(OBJS)\coredll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -4887,8 +4906,10 @@ $(OBJS)\corelib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\corelib_brush.obj: ..\..\src\msw\brush.cpp @@ -5428,6 +5449,11 @@ $(OBJS)\corelib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -6167,8 +6193,10 @@ $(OBJS)\monodll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp @@ -6870,6 +6898,11 @@ $(OBJS)\monodll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp $(OBJS)\monodll_list.obj: ..\..\src\common\list.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -7624,8 +7657,10 @@ $(OBJS)\monolib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_brush.obj: ..\..\src\msw\brush.cpp @@ -8327,6 +8362,11 @@ $(OBJS)\monolib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp $(OBJS)\monolib_list.obj: ..\..\src\common\list.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -9654,7 +9694,7 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_d sub_samples: cd ..\..\samples - $(MAKE) /$(MAKEFLAGS) -f makefile.vc all + $(MAKE) -f makefile.vc $(MAKEARGS) all cd $(MAKEDIR) $(SETUPHDIR)\wx\setup.h: diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index ccb995429d..5be184510a 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -271,6 +271,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_artprov.obj & $(OBJS)\monolib_artstd.obj & $(OBJS)\monolib_bmpbase.obj & + $(OBJS)\monolib_bookctrl.obj & $(OBJS)\monolib_choiccmn.obj & $(OBJS)\monolib_clipcmn.obj & $(OBJS)\monolib_cmdproc.obj & @@ -342,6 +343,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dcpsg.obj & $(OBJS)\monolib_dirctrlg.obj & $(OBJS)\monolib_dragimgg.obj & + $(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_logg.obj & $(OBJS)\monolib_numdlgg.obj & $(OBJS)\monolib_panelg.obj & @@ -465,6 +467,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_artprov.obj & $(OBJS)\monolib_artstd.obj & $(OBJS)\monolib_bmpbase.obj & + $(OBJS)\monolib_bookctrl.obj & $(OBJS)\monolib_choiccmn.obj & $(OBJS)\monolib_clipcmn.obj & $(OBJS)\monolib_cmdproc.obj & @@ -536,6 +539,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dcpsg.obj & $(OBJS)\monolib_dirctrlg.obj & $(OBJS)\monolib_dragimgg.obj & + $(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_logg.obj & $(OBJS)\monolib_numdlgg.obj & $(OBJS)\monolib_panelg.obj & @@ -657,6 +661,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_artprov.obj & $(OBJS)\coredll_artstd.obj & $(OBJS)\coredll_bmpbase.obj & + $(OBJS)\coredll_bookctrl.obj & $(OBJS)\coredll_choiccmn.obj & $(OBJS)\coredll_clipcmn.obj & $(OBJS)\coredll_cmdproc.obj & @@ -728,6 +733,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dcpsg.obj & $(OBJS)\coredll_dirctrlg.obj & $(OBJS)\coredll_dragimgg.obj & + $(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_logg.obj & $(OBJS)\coredll_numdlgg.obj & $(OBJS)\coredll_panelg.obj & @@ -851,6 +857,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_artprov.obj & $(OBJS)\coredll_artstd.obj & $(OBJS)\coredll_bmpbase.obj & + $(OBJS)\coredll_bookctrl.obj & $(OBJS)\coredll_choiccmn.obj & $(OBJS)\coredll_clipcmn.obj & $(OBJS)\coredll_cmdproc.obj & @@ -922,6 +929,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dcpsg.obj & $(OBJS)\coredll_dirctrlg.obj & $(OBJS)\coredll_dragimgg.obj & + $(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_logg.obj & $(OBJS)\coredll_numdlgg.obj & $(OBJS)\coredll_panelg.obj & @@ -1043,6 +1051,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_artprov.obj & $(OBJS)\corelib_artstd.obj & $(OBJS)\corelib_bmpbase.obj & + $(OBJS)\corelib_bookctrl.obj & $(OBJS)\corelib_choiccmn.obj & $(OBJS)\corelib_clipcmn.obj & $(OBJS)\corelib_cmdproc.obj & @@ -1114,6 +1123,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dcpsg.obj & $(OBJS)\corelib_dirctrlg.obj & $(OBJS)\corelib_dragimgg.obj & + $(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_logg.obj & $(OBJS)\corelib_numdlgg.obj & $(OBJS)\corelib_panelg.obj & @@ -1237,6 +1247,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_artprov.obj & $(OBJS)\corelib_artstd.obj & $(OBJS)\corelib_bmpbase.obj & + $(OBJS)\corelib_bookctrl.obj & $(OBJS)\corelib_choiccmn.obj & $(OBJS)\corelib_clipcmn.obj & $(OBJS)\corelib_cmdproc.obj & @@ -1308,6 +1319,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dcpsg.obj & $(OBJS)\corelib_dirctrlg.obj & $(OBJS)\corelib_dragimgg.obj & + $(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_logg.obj & $(OBJS)\corelib_numdlgg.obj & $(OBJS)\corelib_panelg.obj & @@ -1429,6 +1441,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_artprov.obj & $(OBJS)\monodll_artstd.obj & $(OBJS)\monodll_bmpbase.obj & + $(OBJS)\monodll_bookctrl.obj & $(OBJS)\monodll_choiccmn.obj & $(OBJS)\monodll_clipcmn.obj & $(OBJS)\monodll_cmdproc.obj & @@ -1500,6 +1513,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dcpsg.obj & $(OBJS)\monodll_dirctrlg.obj & $(OBJS)\monodll_dragimgg.obj & + $(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_logg.obj & $(OBJS)\monodll_numdlgg.obj & $(OBJS)\monodll_panelg.obj & @@ -1623,6 +1637,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_artprov.obj & $(OBJS)\monodll_artstd.obj & $(OBJS)\monodll_bmpbase.obj & + $(OBJS)\monodll_bookctrl.obj & $(OBJS)\monodll_choiccmn.obj & $(OBJS)\monodll_clipcmn.obj & $(OBJS)\monodll_cmdproc.obj & @@ -1694,6 +1709,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dcpsg.obj & $(OBJS)\monodll_dirctrlg.obj & $(OBJS)\monodll_dragimgg.obj & + $(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_logg.obj & $(OBJS)\monodll_numdlgg.obj & $(OBJS)\monodll_panelg.obj & @@ -2113,7 +2129,6 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_thread.obj & $(OBJS)\basedll_utils.obj & $(OBJS)\basedll_utilsexc.obj & - $(OBJS)\basedll_bookctrl.obj & $(OBJS)\basedll_event.obj & $(OBJS)\basedll_fs_mem.obj & $(OBJS)\basedll_msgout.obj & @@ -2197,7 +2212,6 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_thread.obj & $(OBJS)\baselib_utils.obj & $(OBJS)\baselib_utilsexc.obj & - $(OBJS)\baselib_bookctrl.obj & $(OBJS)\baselib_event.obj & $(OBJS)\baselib_fs_mem.obj & $(OBJS)\baselib_msgout.obj & @@ -2219,7 +2233,6 @@ COREDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(CXXFLAGS) /fh=$(OBJS)\wxprec_coredll.pch COREDLL_OBJECTS = & $(OBJS)\coredll_dummy.obj & - $(OBJS)\coredll_bookctrl.obj & $(OBJS)\coredll_event.obj & $(OBJS)\coredll_fs_mem.obj & $(OBJS)\coredll_msgout.obj & @@ -2241,7 +2254,6 @@ CORELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & /fh=$(OBJS)\wxprec_corelib.pch CORELIB_OBJECTS = & $(OBJS)\corelib_dummy.obj & - $(OBJS)\corelib_bookctrl.obj & $(OBJS)\corelib_event.obj & $(OBJS)\corelib_fs_mem.obj & $(OBJS)\corelib_msgout.obj & @@ -2343,13 +2355,13 @@ HTMLLIB_OBJECTS = & $(OBJS)\htmllib_m_tables.obj & $(OBJS)\htmllib_winpars.obj & $(OBJS)\htmllib_htmllbox.obj -MAKEARGS = CPPFLAGS=$(CPPFLAGS) OFFICIAL_BUILD=$(OFFICIAL_BUILD) & - WXUNIV=$(WXUNIV) DEBUG_FLAG=$(DEBUG_FLAG) CFLAGS=$(CFLAGS) & - RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) USE_GUI=$(USE_GUI) & - MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) CC=$(CC) USE_HTML=$(USE_HTML) & - BUILD=$(BUILD) LDFLAGS=$(LDFLAGS) DEBUG_INFO=$(DEBUG_INFO) SHARED=$(SHARED) & - VENDOR=$(VENDOR) USE_OPENGL=$(USE_OPENGL) USE_ODBC=$(USE_ODBC) & - UNICODE=$(UNICODE) +MAKEARGS = CPPFLAGS="$(CPPFLAGS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" & + WXUNIV="$(WXUNIV)" DEBUG_FLAG="$(DEBUG_FLAG)" CFLAGS="$(CFLAGS)" & + RUNTIME_LIBS="$(RUNTIME_LIBS)" CXX="$(CXX)" CFG="$(CFG)" & + USE_GUI="$(USE_GUI)" MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" & + CC="$(CC)" USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" LDFLAGS="$(LDFLAGS)" & + DEBUG_INFO="$(DEBUG_INFO)" SHARED="$(SHARED)" VENDOR="$(VENDOR)" & + USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" UNICODE="$(UNICODE)" MONODLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff & @@ -2426,7 +2438,6 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_thread.obj & $(OBJS)\monodll_utils.obj & $(OBJS)\monodll_utilsexc.obj & - $(OBJS)\monodll_bookctrl.obj & $(OBJS)\monodll_event.obj & $(OBJS)\monodll_fs_mem.obj & $(OBJS)\monodll_msgout.obj & @@ -2523,7 +2534,6 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_thread.obj & $(OBJS)\monolib_utils.obj & $(OBJS)\monolib_utilsexc.obj & - $(OBJS)\monolib_bookctrl.obj & $(OBJS)\monolib_event.obj & $(OBJS)\monolib_fs_mem.obj & $(OBJS)\monolib_msgout.obj & @@ -2883,9 +2893,6 @@ $(OBJS)\basedll_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp $(OBJS)\basedll_basemsw.obj : .AUTODEPEND ..\..\src\msw\basemsw.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp - $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -3099,9 +3106,6 @@ $(OBJS)\baselib_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp $(OBJS)\baselib_basemsw.obj : .AUTODEPEND ..\..\src\msw\basemsw.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp - $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -3380,8 +3384,10 @@ $(OBJS)\coredll_bmpbuttn.obj : .AUTODEPEND ..\..\src\msw\bmpbuttn.cpp !endif !endif +!ifeq USE_GUI 1 $(OBJS)\coredll_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif !ifeq USE_GUI 1 $(OBJS)\coredll_brush.obj : .AUTODEPEND ..\..\src\msw\brush.cpp @@ -3957,6 +3963,11 @@ $(OBJS)\coredll_lboxcmn.obj : .AUTODEPEND ..\..\src\common\lboxcmn.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp + $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\coredll_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp @@ -4592,8 +4603,10 @@ $(OBJS)\corelib_bmpbuttn.obj : .AUTODEPEND ..\..\src\msw\bmpbuttn.cpp !endif !endif +!ifeq USE_GUI 1 $(OBJS)\corelib_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif !ifeq USE_GUI 1 $(OBJS)\corelib_brush.obj : .AUTODEPEND ..\..\src\msw\brush.cpp @@ -5169,6 +5182,11 @@ $(OBJS)\corelib_lboxcmn.obj : .AUTODEPEND ..\..\src\common\lboxcmn.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp + $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\corelib_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp @@ -5972,8 +5990,10 @@ $(OBJS)\monodll_bmpbuttn.obj : .AUTODEPEND ..\..\src\msw\bmpbuttn.cpp !endif !endif +!ifeq USE_GUI 1 $(OBJS)\monodll_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif !ifeq USE_GUI 1 $(OBJS)\monodll_brush.obj : .AUTODEPEND ..\..\src\msw\brush.cpp @@ -6711,6 +6731,11 @@ $(OBJS)\monodll_lboxcmn.obj : .AUTODEPEND ..\..\src\common\lboxcmn.cpp $(OBJS)\monodll_list.obj : .AUTODEPEND ..\..\src\common\list.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!ifeq USE_GUI 1 +$(OBJS)\monodll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monodll_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp @@ -7529,8 +7554,10 @@ $(OBJS)\monolib_bmpbuttn.obj : .AUTODEPEND ..\..\src\msw\bmpbuttn.cpp !endif !endif +!ifeq USE_GUI 1 $(OBJS)\monolib_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif !ifeq USE_GUI 1 $(OBJS)\monolib_brush.obj : .AUTODEPEND ..\..\src\msw\brush.cpp @@ -8268,6 +8295,11 @@ $(OBJS)\monolib_lboxcmn.obj : .AUTODEPEND ..\..\src\common\lboxcmn.cpp $(OBJS)\monolib_list.obj : .AUTODEPEND ..\..\src\common\list.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!ifeq USE_GUI 1 +$(OBJS)\monolib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 !ifeq WXUNIV 0 $(OBJS)\monolib_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp @@ -9469,7 +9501,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wa @%create $(OBJS)\advdll.lbc @%append $(OBJS)\advdll.lbc option quiet @%append $(OBJS)\advdll.lbc name $^@ - @%append $(OBJS)\advdll.lbc option incremental + @%append $(OBJS)\advdll.lbc option caseexact @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\advdll.lbc library %i @@ -9498,7 +9530,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(B @%create $(OBJS)\basedll.lbc @%append $(OBJS)\basedll.lbc option quiet @%append $(OBJS)\basedll.lbc name $^@ - @%append $(OBJS)\basedll.lbc option incremental + @%append $(OBJS)\basedll.lbc option caseexact @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\basedll.lbc library %i @@ -9567,7 +9599,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_w @%create $(OBJS)\coredll.lbc @%append $(OBJS)\coredll.lbc option quiet @%append $(OBJS)\coredll.lbc name $^@ - @%append $(OBJS)\coredll.lbc option incremental + @%append $(OBJS)\coredll.lbc option caseexact @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\coredll.lbc library %i @@ -9598,7 +9630,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid @%create $(OBJS)\dbgriddll.lbc @%append $(OBJS)\dbgriddll.lbc option quiet @%append $(OBJS)\dbgriddll.lbc name $^@ - @%append $(OBJS)\dbgriddll.lbc option incremental + @%append $(OBJS)\dbgriddll.lbc option caseexact @%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(DBGRIDDLL_OBJECTS)) do @%append $(OBJS)\dbgriddll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\dbgriddll.lbc library %i @@ -9631,7 +9663,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat @%create $(OBJS)\gldll.lbc @%append $(OBJS)\gldll.lbc option quiet @%append $(OBJS)\gldll.lbc name $^@ - @%append $(OBJS)\gldll.lbc option incremental + @%append $(OBJS)\gldll.lbc option caseexact @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i @@ -9661,7 +9693,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_w @%create $(OBJS)\htmldll.lbc @%append $(OBJS)\htmldll.lbc option quiet @%append $(OBJS)\htmldll.lbc name $^@ - @%append $(OBJS)\htmldll.lbc option incremental + @%append $(OBJS)\htmldll.lbc option caseexact @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\htmldll.lbc library %i @@ -9702,7 +9734,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(V @%create $(OBJS)\monodll.lbc @%append $(OBJS)\monodll.lbc option quiet @%append $(OBJS)\monodll.lbc name $^@ - @%append $(OBJS)\monodll.lbc option incremental + @%append $(OBJS)\monodll.lbc option caseexact @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\monodll.lbc library %i @@ -9728,7 +9760,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll : @%create $(OBJS)\netdll.lbc @%append $(OBJS)\netdll.lbc option quiet @%append $(OBJS)\netdll.lbc name $^@ - @%append $(OBJS)\netdll.lbc option incremental + @%append $(OBJS)\netdll.lbc option caseexact @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\netdll.lbc library %i @@ -9755,7 +9787,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll : @%create $(OBJS)\odbcdll.lbc @%append $(OBJS)\odbcdll.lbc option quiet @%append $(OBJS)\odbcdll.lbc name $^@ - @%append $(OBJS)\odbcdll.lbc option incremental + @%append $(OBJS)\odbcdll.lbc option caseexact @%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\odbcdll.lbc library %i @@ -9830,7 +9862,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll : @%create $(OBJS)\xmldll.lbc @%append $(OBJS)\xmldll.lbc option quiet @%append $(OBJS)\xmldll.lbc name $^@ - @%append $(OBJS)\xmldll.lbc option incremental + @%append $(OBJS)\xmldll.lbc option caseexact @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\xmldll.lbc library %i diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp index 2c99ffcddf..674b5f6b66 100644 --- a/build/msw/wx_base.dsp +++ b/build/msw/wx_base.dsp @@ -662,6 +662,14 @@ SOURCE=..\..\src\common\wxchar.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\xti.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\common\xtistrm.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\zipstrm.cpp # End Source File # Begin Source File @@ -1299,6 +1307,14 @@ SOURCE=..\..\include\wx\wxprec.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xti.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xtistrm.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\zipstrm.h # End Source File # Begin Source File diff --git a/contrib/samples/animate/Makefile.in b/contrib/samples/animate/Makefile.in index ea081e1af2..429ba0e675 100644 --- a/contrib/samples/animate/Makefile.in +++ b/contrib/samples/animate/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,8 +73,7 @@ WX_VERSION = 2.5.0 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 -i $(srcdir)/../../include -o \ - anitest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - sample.r + anitest Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) @@ -91,22 +87,21 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__anitest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__anitest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C anitest$(EXEEXT) +@COND_PLATFORM_MAC_1@__anitest___mac_setfilecmd = $(SETFILE) -a C anitest @COND_PLATFORM_WIN32_1@__anitest___win32rc = anitest_anitest_rc.o @COND_PLATFORM_MACOSX_1@__anitest_bundle___depname = anitest_bundle ### Targets: ### -all: anitest$(EXEEXT) $(__anitest_bundle___depname) data +all: anitest $(__anitest_bundle___depname) data -anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc) +anitest: $(ANITEST_OBJECTS) $(__anitest___win32rc) $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-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) $(__anitest___mac_rezcmd) $(__anitest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -anitest.app/Contents: anitest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +anitest.app/Contents: anitest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p anitest.app/Contents mkdir -p anitest.app/Contents/MacOS mkdir -p anitest.app/Contents/Resources @@ -121,14 +116,14 @@ anitest.app/Contents: anitest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >anitest.app/Contents/PkgInfo - ln -f anitest$(EXEEXT) anitest.app/Contents/MacOS/anitest + ln -f anitest anitest.app/Contents/MacOS/anitest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc anitest.app/Contents/Resources/anitest.rsrc ln -f $(top_srcdir)/src/mac/wxmac.icns anitest.app/Contents/Resources/wxmac.icns anitest_anitest.o: $(srcdir)/anitest.cpp - $(CXXC) -c -o $@ $(ANITEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(ANITEST_CXXFLAGS) $< anitest_anitest_rc.o: $(srcdir)/anitest.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 --include-dir $(srcdir)/../../include @@ -138,7 +133,7 @@ anitest_anitest_rc.o: $(srcdir)/anitest.rc clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f anitest$(EXEEXT) + rm -f anitest rm -rf anitest.app data: diff --git a/contrib/samples/deprecated/proplist/Makefile.in b/contrib/samples/deprecated/proplist/Makefile.in index 6356df2107..c5f82717ef 100644 --- a/contrib/samples/deprecated/proplist/Makefile.in +++ b/contrib/samples/deprecated/proplist/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,7 +73,7 @@ WX_VERSION = 2.5.0 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 -i \ - $(srcdir)/../../../include -o proplist$(EXEEXT) Carbon.r \ + $(srcdir)/../../../include -o proplist Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -91,19 +88,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__proplist___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__proplist___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C proplist$(EXEEXT) +@COND_PLATFORM_MAC_1@__proplist___mac_setfilecmd = $(SETFILE) -a C proplist @COND_PLATFORM_WIN32_1@__proplist___win32rc = proplist_proplist_rc.o @COND_PLATFORM_MACOSX_1@__proplist_bundle___depname = proplist_bundle ### Targets: ### -all: proplist$(EXEEXT) $(__proplist_bundle___depname) +all: proplist $(__proplist_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f proplist$(EXEEXT) + rm -f proplist rm -rf proplist.app distclean: clean @@ -113,13 +109,13 @@ install: all install-strip: install -proplist$(EXEEXT): $(PROPLIST_OBJECTS) $(__proplist___win32rc) +proplist: $(PROPLIST_OBJECTS) $(__proplist___win32rc) $(CXX) -o $@ $(PROPLIST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-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) $(__proplist___mac_rezcmd) $(__proplist___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -proplist.app/Contents: proplist$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +proplist.app/Contents: proplist $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p proplist.app/Contents mkdir -p proplist.app/Contents/MacOS mkdir -p proplist.app/Contents/Resources @@ -134,7 +130,7 @@ proplist.app/Contents: proplist$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >proplist.app/Contents/PkgInfo - ln -f proplist$(EXEEXT) proplist.app/Contents/MacOS/proplist + ln -f proplist proplist.app/Contents/MacOS/proplist ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc proplist.app/Contents/Resources/proplist.rsrc @@ -143,7 +139,7 @@ proplist.app/Contents: proplist$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@proplist_bundle: proplist.app/Contents proplist_proplist.o: $(srcdir)/proplist.cpp - $(CXXC) -c -o $@ $(PROPLIST_CXXFLAGS) $< + $(CXX) -c -o $@ $(PROPLIST_CXXFLAGS) $< proplist_proplist_rc.o: $(srcdir)/proplist.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 --include-dir $(srcdir)/../../../include diff --git a/contrib/samples/deprecated/resource/Makefile.in b/contrib/samples/deprecated/resource/Makefile.in index b901f03600..566c756e1d 100644 --- a/contrib/samples/deprecated/resource/Makefile.in +++ b/contrib/samples/deprecated/resource/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,7 +73,7 @@ WX_VERSION = 2.5.0 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 -i \ - $(srcdir)/../../../include -o resource$(EXEEXT) Carbon.r \ + $(srcdir)/../../../include -o resource Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -91,19 +88,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__resource___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__resource___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C resource$(EXEEXT) +@COND_PLATFORM_MAC_1@__resource___mac_setfilecmd = $(SETFILE) -a C resource @COND_PLATFORM_WIN32_1@__resource___win32rc = resource_resource_rc.o @COND_PLATFORM_MACOSX_1@__resource_bundle___depname = resource_bundle ### Targets: ### -all: resource$(EXEEXT) $(__resource_bundle___depname) +all: resource $(__resource_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f resource$(EXEEXT) + rm -f resource rm -rf resource.app distclean: clean @@ -113,13 +109,13 @@ install: all install-strip: install -resource$(EXEEXT): $(RESOURCE_OBJECTS) $(__resource___win32rc) +resource: $(RESOURCE_OBJECTS) $(__resource___win32rc) $(CXX) -o $@ $(RESOURCE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-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) $(__resource___mac_rezcmd) $(__resource___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -resource.app/Contents: resource$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +resource.app/Contents: resource $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p resource.app/Contents mkdir -p resource.app/Contents/MacOS mkdir -p resource.app/Contents/Resources @@ -134,7 +130,7 @@ resource.app/Contents: resource$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >resource.app/Contents/PkgInfo - ln -f resource$(EXEEXT) resource.app/Contents/MacOS/resource + ln -f resource resource.app/Contents/MacOS/resource ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc resource.app/Contents/Resources/resource.rsrc @@ -143,7 +139,7 @@ resource.app/Contents: resource$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@resource_bundle: resource.app/Contents resource_resource.o: $(srcdir)/resource.cpp - $(CXXC) -c -o $@ $(RESOURCE_CXXFLAGS) $< + $(CXX) -c -o $@ $(RESOURCE_CXXFLAGS) $< resource_resource_rc.o: $(srcdir)/resource.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 --include-dir $(srcdir)/../../../include diff --git a/contrib/samples/deprecated/treelay/Makefile.in b/contrib/samples/deprecated/treelay/Makefile.in index 841e20187b..08d6d00e29 100644 --- a/contrib/samples/deprecated/treelay/Makefile.in +++ b/contrib/samples/deprecated/treelay/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,7 +73,7 @@ WX_VERSION = 2.5.0 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 -i \ - $(srcdir)/../../../include -o treelay$(EXEEXT) Carbon.r \ + $(srcdir)/../../../include -o treelay Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -91,19 +88,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__treelay___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__treelay___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C treelay$(EXEEXT) +@COND_PLATFORM_MAC_1@__treelay___mac_setfilecmd = $(SETFILE) -a C treelay @COND_PLATFORM_WIN32_1@__treelay___win32rc = treelay_treelay_rc.o @COND_PLATFORM_MACOSX_1@__treelay_bundle___depname = treelay_bundle ### Targets: ### -all: treelay$(EXEEXT) $(__treelay_bundle___depname) +all: treelay $(__treelay_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f treelay$(EXEEXT) + rm -f treelay rm -rf treelay.app distclean: clean @@ -113,13 +109,13 @@ install: all install-strip: install -treelay$(EXEEXT): $(TREELAY_OBJECTS) $(__treelay___win32rc) +treelay: $(TREELAY_OBJECTS) $(__treelay___win32rc) $(CXX) -o $@ $(TREELAY_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-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) $(__treelay___mac_rezcmd) $(__treelay___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -treelay.app/Contents: treelay$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +treelay.app/Contents: treelay $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p treelay.app/Contents mkdir -p treelay.app/Contents/MacOS mkdir -p treelay.app/Contents/Resources @@ -134,7 +130,7 @@ treelay.app/Contents: treelay$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >treelay.app/Contents/PkgInfo - ln -f treelay$(EXEEXT) treelay.app/Contents/MacOS/treelay + ln -f treelay treelay.app/Contents/MacOS/treelay ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc treelay.app/Contents/Resources/treelay.rsrc @@ -143,7 +139,7 @@ treelay.app/Contents: treelay$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@treelay_bundle: treelay.app/Contents treelay_treelay.o: $(srcdir)/treelay.cpp - $(CXXC) -c -o $@ $(TREELAY_CXXFLAGS) $< + $(CXX) -c -o $@ $(TREELAY_CXXFLAGS) $< treelay_treelay_rc.o: $(srcdir)/treelay.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 --include-dir $(srcdir)/../../../include diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in index 0ea6086db4..2168413973 100644 --- a/contrib/samples/fl/Makefile.in +++ b/contrib/samples/fl/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -73,8 +72,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -105,31 +102,31 @@ WX_VERSION = 2.5.0 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ - BMP_DIR="bitmaps/" -o fl_sample2$(EXEEXT) Carbon.r \ + BMP_DIR="bitmaps/" -o fl_sample2 Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_5 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ - BMP_DIR="bitmaps/" -o fl_sample3$(EXEEXT) Carbon.r \ + BMP_DIR="bitmaps/" -o fl_sample3 Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_6 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ - BMP_DIR="bitmaps/" -o fl_sample1$(EXEEXT) Carbon.r \ + BMP_DIR="bitmaps/" -o fl_sample1 Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_7 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ - BMP_DIR="bitmaps/" -o fl_demo1$(EXEEXT) Carbon.r \ + BMP_DIR="bitmaps/" -o fl_demo1 Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_8 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ - BMP_DIR="bitmaps/" -o fl_demo2$(EXEEXT) Carbon.r \ + BMP_DIR="bitmaps/" -o fl_demo2 Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_9 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -144,59 +141,57 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1_1 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__fl_demo1___mac_rezcmd = $(__MACOSX_RESOURCES_p_8) -@COND_PLATFORM_MAC_1@__fl_demo1___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_demo1$(EXEEXT) +@COND_PLATFORM_MAC_1@__fl_demo1___mac_setfilecmd = $(SETFILE) -a C fl_demo1 @COND_PLATFORM_WIN32_1@__fl_demo1___win32rc = fl_demo1_fl_demo1_rc.o @COND_PLATFORM_MACOSX_1@__fl_demo1_bundle___depname = fl_demo1_bundle @COND_PLATFORM_MAC_1@__fl_demo2___mac_rezcmd = $(__MACOSX_RESOURCES_p_9) -@COND_PLATFORM_MAC_1@__fl_demo2___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_demo2$(EXEEXT) +@COND_PLATFORM_MAC_1@__fl_demo2___mac_setfilecmd = $(SETFILE) -a C fl_demo2 @COND_PLATFORM_WIN32_1@__fl_demo2___win32rc = fl_demo2_fl_demo2_rc.o @COND_PLATFORM_MACOSX_1@__fl_demo2_bundle___depname = fl_demo2_bundle @COND_PLATFORM_MAC_1@__fl_sample1___mac_rezcmd = $(__MACOSX_RESOURCES_p_7) @COND_PLATFORM_MAC_1@__fl_sample1___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_sample1$(EXEEXT) +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_sample1 @COND_PLATFORM_WIN32_1@__fl_sample1___win32rc = fl_sample1_fl_sample1_rc.o @COND_PLATFORM_MACOSX_1@__fl_sample1_bundle___depname = fl_sample1_bundle @COND_PLATFORM_MAC_1@__fl_sample2___mac_rezcmd = $(__MACOSX_RESOURCES_p_5) @COND_PLATFORM_MAC_1@__fl_sample2___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_sample2$(EXEEXT) +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_sample2 @COND_PLATFORM_WIN32_1@__fl_sample2___win32rc = fl_sample2_fl_sample2_rc.o @COND_PLATFORM_MACOSX_1@__fl_sample2_bundle___depname = fl_sample2_bundle @COND_PLATFORM_MAC_1@__fl_sample3___mac_rezcmd = $(__MACOSX_RESOURCES_p_6) @COND_PLATFORM_MAC_1@__fl_sample3___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_sample3$(EXEEXT) +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_sample3 @COND_PLATFORM_WIN32_1@__fl_sample3___win32rc = fl_sample3_fl_sample3_rc.o @COND_PLATFORM_MACOSX_1@__fl_sample3_bundle___depname = fl_sample3_bundle ### Targets: ### -all: fl_demo1$(EXEEXT) $(__fl_demo1_bundle___depname) fl_demo2$(EXEEXT) $(__fl_demo2_bundle___depname) fl_sample1$(EXEEXT) $(__fl_sample1_bundle___depname) fl_sample2$(EXEEXT) $(__fl_sample2_bundle___depname) fl_sample3$(EXEEXT) $(__fl_sample3_bundle___depname) +all: fl_demo1 $(__fl_demo1_bundle___depname) fl_demo2 $(__fl_demo2_bundle___depname) fl_sample1 $(__fl_sample1_bundle___depname) fl_sample2 $(__fl_sample2_bundle___depname) fl_sample3 $(__fl_sample3_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f fl_demo1$(EXEEXT) + rm -f fl_demo1 rm -rf fl_demo1.app - rm -f fl_demo2$(EXEEXT) + rm -f fl_demo2 rm -rf fl_demo2.app - rm -f fl_sample1$(EXEEXT) + rm -f fl_sample1 rm -rf fl_sample1.app - rm -f fl_sample2$(EXEEXT) + rm -f fl_sample2 rm -rf fl_sample2.app - rm -f fl_sample3$(EXEEXT) + rm -f fl_sample3 rm -rf fl_sample3.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -fl_demo1$(EXEEXT): $(FL_DEMO1_OBJECTS) $(__fl_demo1___win32rc) +fl_demo1: $(FL_DEMO1_OBJECTS) $(__fl_demo1___win32rc) $(CXX) -o $@ $(FL_DEMO1_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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) $(__fl_demo1___mac_rezcmd) $(__fl_demo1___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -fl_demo1.app/Contents: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +fl_demo1.app/Contents: fl_demo1 $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p fl_demo1.app/Contents mkdir -p fl_demo1.app/Contents/MacOS mkdir -p fl_demo1.app/Contents/Resources @@ -211,7 +206,7 @@ fl_demo1.app/Contents: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >fl_demo1.app/Contents/PkgInfo - ln -f fl_demo1$(EXEEXT) fl_demo1.app/Contents/MacOS/fl_demo1 + ln -f fl_demo1 fl_demo1.app/Contents/MacOS/fl_demo1 ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_demo1.app/Contents/Resources/fl_demo1.rsrc @@ -220,18 +215,18 @@ fl_demo1.app/Contents: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@fl_demo1_bundle: fl_demo1.app/Contents fl_demo1_fl_demo1.o: $(srcdir)/fl_demo1.cpp - $(CXXC) -c -o $@ $(FL_DEMO1_CXXFLAGS) $< + $(CXX) -c -o $@ $(FL_DEMO1_CXXFLAGS) $< fl_demo1_fl_demo1_rc.o: $(srcdir)/fl_demo1.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" -fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc) +fl_demo2: $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc) $(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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) $(__fl_demo2___mac_rezcmd) $(__fl_demo2___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -fl_demo2.app/Contents: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +fl_demo2.app/Contents: fl_demo2 $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p fl_demo2.app/Contents mkdir -p fl_demo2.app/Contents/MacOS mkdir -p fl_demo2.app/Contents/Resources @@ -246,7 +241,7 @@ fl_demo2.app/Contents: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >fl_demo2.app/Contents/PkgInfo - ln -f fl_demo2$(EXEEXT) fl_demo2.app/Contents/MacOS/fl_demo2 + ln -f fl_demo2 fl_demo2.app/Contents/MacOS/fl_demo2 ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_demo2.app/Contents/Resources/fl_demo2.rsrc @@ -255,18 +250,18 @@ fl_demo2.app/Contents: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@fl_demo2_bundle: fl_demo2.app/Contents fl_demo2_fl_demo2.o: $(srcdir)/fl_demo2.cpp - $(CXXC) -c -o $@ $(FL_DEMO2_CXXFLAGS) $< + $(CXX) -c -o $@ $(FL_DEMO2_CXXFLAGS) $< fl_demo2_fl_demo2_rc.o: $(srcdir)/fl_demo2.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" -fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc) +fl_sample1: $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc) $(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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) $(__fl_sample1___mac_rezcmd) $(__fl_sample1___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -fl_sample1.app/Contents: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +fl_sample1.app/Contents: fl_sample1 $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p fl_sample1.app/Contents mkdir -p fl_sample1.app/Contents/MacOS mkdir -p fl_sample1.app/Contents/Resources @@ -281,7 +276,7 @@ fl_sample1.app/Contents: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in echo -n "APPL????" >fl_sample1.app/Contents/PkgInfo - ln -f fl_sample1$(EXEEXT) fl_sample1.app/Contents/MacOS/fl_sample1 + ln -f fl_sample1 fl_sample1.app/Contents/MacOS/fl_sample1 ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample1.app/Contents/Resources/fl_sample1.rsrc @@ -290,18 +285,18 @@ fl_sample1.app/Contents: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in @COND_PLATFORM_MACOSX_1@fl_sample1_bundle: fl_sample1.app/Contents fl_sample1_fl_sample1.o: $(srcdir)/fl_sample1.cpp - $(CXXC) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $< + $(CXX) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $< fl_sample1_fl_sample1_rc.o: $(srcdir)/fl_sample1.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" -fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc) +fl_sample2: $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc) $(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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) $(__fl_sample2___mac_rezcmd) $(__fl_sample2___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -fl_sample2.app/Contents: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +fl_sample2.app/Contents: fl_sample2 $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p fl_sample2.app/Contents mkdir -p fl_sample2.app/Contents/MacOS mkdir -p fl_sample2.app/Contents/Resources @@ -316,7 +311,7 @@ fl_sample2.app/Contents: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in echo -n "APPL????" >fl_sample2.app/Contents/PkgInfo - ln -f fl_sample2$(EXEEXT) fl_sample2.app/Contents/MacOS/fl_sample2 + ln -f fl_sample2 fl_sample2.app/Contents/MacOS/fl_sample2 ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample2.app/Contents/Resources/fl_sample2.rsrc @@ -325,18 +320,18 @@ fl_sample2.app/Contents: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in @COND_PLATFORM_MACOSX_1@fl_sample2_bundle: fl_sample2.app/Contents fl_sample2_fl_sample2.o: $(srcdir)/fl_sample2.cpp - $(CXXC) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $< + $(CXX) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $< fl_sample2_fl_sample2_rc.o: $(srcdir)/fl_sample2.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" -fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc) +fl_sample3: $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc) $(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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) $(__fl_sample3___mac_rezcmd) $(__fl_sample3___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -fl_sample3.app/Contents: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +fl_sample3.app/Contents: fl_sample3 $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p fl_sample3.app/Contents mkdir -p fl_sample3.app/Contents/MacOS mkdir -p fl_sample3.app/Contents/Resources @@ -351,7 +346,7 @@ fl_sample3.app/Contents: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in echo -n "APPL????" >fl_sample3.app/Contents/PkgInfo - ln -f fl_sample3$(EXEEXT) fl_sample3.app/Contents/MacOS/fl_sample3 + ln -f fl_sample3 fl_sample3.app/Contents/MacOS/fl_sample3 ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample3.app/Contents/Resources/fl_sample3.rsrc @@ -360,7 +355,7 @@ fl_sample3.app/Contents: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in @COND_PLATFORM_MACOSX_1@fl_sample3_bundle: fl_sample3.app/Contents fl_sample3_fl_sample3.o: $(srcdir)/fl_sample3.cpp - $(CXXC) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $< + $(CXX) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $< fl_sample3_fl_sample3_rc.o: $(srcdir)/fl_sample3.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in index 7eb0bfa85c..db4dd537fe 100644 --- a/contrib/samples/gizmos/dynsash/Makefile.in +++ b/contrib/samples/gizmos/dynsash/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,7 +73,7 @@ WX_VERSION = 2.5.0 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 -i \ - $(srcdir)/../../../include -o dynsash$(EXEEXT) Carbon.r \ + $(srcdir)/../../../include -o dynsash Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -94,31 +91,30 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__dynsash___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__dynsash___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C dynsash$(EXEEXT) +@COND_PLATFORM_MAC_1@__dynsash___mac_setfilecmd = $(SETFILE) -a C dynsash @COND_PLATFORM_WIN32_1@__dynsash___win32rc = dynsash_sample_rc.o @COND_PLATFORM_MACOSX_1@__dynsash_bundle___depname = dynsash_bundle ### Targets: ### -all: dynsash$(EXEEXT) $(__dynsash_bundle___depname) +all: dynsash $(__dynsash_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f dynsash$(EXEEXT) + rm -f dynsash rm -rf dynsash.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -dynsash$(EXEEXT): $(DYNSASH_OBJECTS) $(__dynsash___win32rc) +dynsash: $(DYNSASH_OBJECTS) $(__dynsash___win32rc) $(CXX) -o $@ $(DYNSASH_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX) $(__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) $(__dynsash___mac_rezcmd) $(__dynsash___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -dynsash.app/Contents: dynsash$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +dynsash.app/Contents: dynsash $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p dynsash.app/Contents mkdir -p dynsash.app/Contents/MacOS mkdir -p dynsash.app/Contents/Resources @@ -133,7 +129,7 @@ dynsash.app/Contents: dynsash$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >dynsash.app/Contents/PkgInfo - ln -f dynsash$(EXEEXT) dynsash.app/Contents/MacOS/dynsash + ln -f dynsash dynsash.app/Contents/MacOS/dynsash ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dynsash.app/Contents/Resources/dynsash.rsrc @@ -142,7 +138,7 @@ dynsash.app/Contents: dynsash$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@dynsash_bundle: dynsash.app/Contents dynsash_dynsash.o: $(srcdir)/dynsash.cpp - $(CXXC) -c -o $@ $(DYNSASH_CXXFLAGS) $< + $(CXX) -c -o $@ $(DYNSASH_CXXFLAGS) $< dynsash_sample_rc.o: $(srcdir)/../../../../samples/sample.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 diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in index f96844f0fd..ba2e12cde0 100644 --- a/contrib/samples/gizmos/dynsash_switch/Makefile.in +++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,7 +73,7 @@ WX_VERSION = 2.5.0 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 -i \ - $(srcdir)/../../../include -o dynsash_switch$(EXEEXT) Carbon.r \ + $(srcdir)/../../../include -o dynsash_switch Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -93,7 +90,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__dynsash_switch___mac_rezcmd = \ @COND_PLATFORM_MAC_1@ $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__dynsash_switch___mac_setfilecmd \ -@COND_PLATFORM_MAC_1@ = $(SETFILE) -a C dynsash_switch$(EXEEXT) +@COND_PLATFORM_MAC_1@ = $(SETFILE) -a C dynsash_switch @COND_PLATFORM_WIN32_1@__dynsash_switch___win32rc = \ @COND_PLATFORM_WIN32_1@ dynsash_switch_sample_rc.o @COND_PLATFORM_MACOSX_1@__dynsash_switch_bundle___depname \ @@ -101,24 +98,24 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ ### Targets: ### -all: dynsash_switch$(EXEEXT) $(__dynsash_switch_bundle___depname) +all: dynsash_switch $(__dynsash_switch_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f dynsash_switch$(EXEEXT) + rm -f dynsash_switch rm -rf dynsash_switch.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -dynsash_switch$(EXEEXT): $(DYNSASH_SWITCH_OBJECTS) $(__dynsash_switch___win32rc) +dynsash_switch: $(DYNSASH_SWITCH_OBJECTS) $(__dynsash_switch___win32rc) $(CXX) -o $@ $(DYNSASH_SWITCH_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-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) $(__dynsash_switch___mac_rezcmd) $(__dynsash_switch___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -dynsash_switch.app/Contents: dynsash_switch$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +dynsash_switch.app/Contents: dynsash_switch $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p dynsash_switch.app/Contents mkdir -p dynsash_switch.app/Contents/MacOS mkdir -p dynsash_switch.app/Contents/Resources @@ -133,7 +130,7 @@ dynsash_switch.app/Contents: dynsash_switch$(EXEEXT) $(top_srcdir)/src/mac/Info. echo -n "APPL????" >dynsash_switch.app/Contents/PkgInfo - ln -f dynsash_switch$(EXEEXT) dynsash_switch.app/Contents/MacOS/dynsash_switch + ln -f dynsash_switch dynsash_switch.app/Contents/MacOS/dynsash_switch ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dynsash_switch.app/Contents/Resources/dynsash_switch.rsrc @@ -142,7 +139,7 @@ dynsash_switch.app/Contents: dynsash_switch$(EXEEXT) $(top_srcdir)/src/mac/Info. @COND_PLATFORM_MACOSX_1@dynsash_switch_bundle: dynsash_switch.app/Contents dynsash_switch_dynsash_switch.o: $(srcdir)/dynsash_switch.cpp - $(CXXC) -c -o $@ $(DYNSASH_SWITCH_CXXFLAGS) $< + $(CXX) -c -o $@ $(DYNSASH_SWITCH_CXXFLAGS) $< dynsash_switch_sample_rc.o: $(srcdir)/../../../../samples/sample.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 diff --git a/contrib/samples/gizmos/editlbox/Makefile.in b/contrib/samples/gizmos/editlbox/Makefile.in index 573dc431e4..e38edd509e 100644 --- a/contrib/samples/gizmos/editlbox/Makefile.in +++ b/contrib/samples/gizmos/editlbox/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,7 +73,7 @@ WX_VERSION = 2.5.0 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 -i \ - $(srcdir)/../../../include -o test$(EXEEXT) Carbon.r \ + $(srcdir)/../../../include -o test Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -91,19 +88,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__test___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C test$(EXEEXT) +@COND_PLATFORM_MAC_1@__test___mac_setfilecmd = $(SETFILE) -a C test @COND_PLATFORM_WIN32_1@__test___win32rc = test_sample_rc.o @COND_PLATFORM_MACOSX_1@__test_bundle___depname = test_bundle ### Targets: ### -all: test$(EXEEXT) $(__test_bundle___depname) +all: test $(__test_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f test$(EXEEXT) + rm -f test rm -rf test.app distclean: clean @@ -113,13 +109,13 @@ install: all install-strip: install -test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) +test: $(TEST_OBJECTS) $(__test___win32rc) $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-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) $(__test___mac_rezcmd) $(__test___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -test.app/Contents: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +test.app/Contents: test $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p test.app/Contents mkdir -p test.app/Contents/MacOS mkdir -p test.app/Contents/Resources @@ -134,7 +130,7 @@ test.app/Contents: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM echo -n "APPL????" >test.app/Contents/PkgInfo - ln -f test$(EXEEXT) test.app/Contents/MacOS/test + ln -f test test.app/Contents/MacOS/test ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc test.app/Contents/Resources/test.rsrc @@ -146,7 +142,7 @@ test_sample_rc.o: $(srcdir)/../../../../samples/sample.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 test_test.o: $(srcdir)/test.cpp - $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEST_CXXFLAGS) $< uninstall: diff --git a/contrib/samples/gizmos/led/Makefile.in b/contrib/samples/gizmos/led/Makefile.in index d8ca124128..51c7689b67 100644 --- a/contrib/samples/gizmos/led/Makefile.in +++ b/contrib/samples/gizmos/led/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,7 +73,7 @@ WX_VERSION = 2.5.0 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 -i \ - $(srcdir)/../../../include -o led$(EXEEXT) Carbon.r \ + $(srcdir)/../../../include -o led Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -91,18 +88,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__led___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__led___mac_setfilecmd = $(SETFILE) -a C led$(EXEEXT) +@COND_PLATFORM_MAC_1@__led___mac_setfilecmd = $(SETFILE) -a C led @COND_PLATFORM_WIN32_1@__led___win32rc = led_sample_rc.o @COND_PLATFORM_MACOSX_1@__led_bundle___depname = led_bundle ### Targets: ### -all: led$(EXEEXT) $(__led_bundle___depname) +all: led $(__led_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f led$(EXEEXT) + rm -f led rm -rf led.app distclean: clean @@ -112,13 +109,13 @@ install: all install-strip: install -led$(EXEEXT): $(LED_OBJECTS) $(__led___win32rc) +led: $(LED_OBJECTS) $(__led___win32rc) $(CXX) -o $@ $(LED_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-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) $(__led___mac_rezcmd) $(__led___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -led.app/Contents: led$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +led.app/Contents: led $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p led.app/Contents mkdir -p led.app/Contents/MacOS mkdir -p led.app/Contents/Resources @@ -133,7 +130,7 @@ led.app/Contents: led$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME) echo -n "APPL????" >led.app/Contents/PkgInfo - ln -f led$(EXEEXT) led.app/Contents/MacOS/led + ln -f led led.app/Contents/MacOS/led ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc led.app/Contents/Resources/led.rsrc @@ -142,7 +139,7 @@ led.app/Contents: led$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME) @COND_PLATFORM_MACOSX_1@led_bundle: led.app/Contents led_led.o: $(srcdir)/led.cpp - $(CXXC) -c -o $@ $(LED_CXXFLAGS) $< + $(CXX) -c -o $@ $(LED_CXXFLAGS) $< led_sample_rc.o: $(srcdir)/../../../../samples/sample.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 diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in index 0c22ef2880..65bde72a2c 100644 --- a/contrib/samples/gizmos/multicell/Makefile.in +++ b/contrib/samples/gizmos/multicell/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,7 +73,7 @@ WX_VERSION = 2.5.0 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 -i \ - $(srcdir)/../../../include -o mtest$(EXEEXT) Carbon.r \ + $(srcdir)/../../../include -o mtest Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -91,19 +88,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__mtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__mtest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C mtest$(EXEEXT) +@COND_PLATFORM_MAC_1@__mtest___mac_setfilecmd = $(SETFILE) -a C mtest @COND_PLATFORM_WIN32_1@__mtest___win32rc = mtest_sample_rc.o @COND_PLATFORM_MACOSX_1@__mtest_bundle___depname = mtest_bundle ### Targets: ### -all: mtest$(EXEEXT) $(__mtest_bundle___depname) +all: mtest $(__mtest_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f mtest$(EXEEXT) + rm -f mtest rm -rf mtest.app distclean: clean @@ -113,13 +109,13 @@ install: all install-strip: install -mtest$(EXEEXT): $(MTEST_OBJECTS) $(__mtest___win32rc) +mtest: $(MTEST_OBJECTS) $(__mtest___win32rc) $(CXX) -o $@ $(MTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-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) $(__mtest___mac_rezcmd) $(__mtest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -mtest.app/Contents: mtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +mtest.app/Contents: mtest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p mtest.app/Contents mkdir -p mtest.app/Contents/MacOS mkdir -p mtest.app/Contents/Resources @@ -134,7 +130,7 @@ mtest.app/Contents: mtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRN echo -n "APPL????" >mtest.app/Contents/PkgInfo - ln -f mtest$(EXEEXT) mtest.app/Contents/MacOS/mtest + ln -f mtest mtest.app/Contents/MacOS/mtest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mtest.app/Contents/Resources/mtest.rsrc @@ -143,7 +139,7 @@ mtest.app/Contents: mtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRN @COND_PLATFORM_MACOSX_1@mtest_bundle: mtest.app/Contents mtest_mtest.o: $(srcdir)/mtest.cpp - $(CXXC) -c -o $@ $(MTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(MTEST_CXXFLAGS) $< mtest_sample_rc.o: $(srcdir)/../../../../samples/sample.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 diff --git a/contrib/samples/gizmos/splittree/Makefile.in b/contrib/samples/gizmos/splittree/Makefile.in index 5fb53258ec..b0bd8fa1a7 100644 --- a/contrib/samples/gizmos/splittree/Makefile.in +++ b/contrib/samples/gizmos/splittree/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,7 +73,7 @@ WX_VERSION = 2.5.0 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 -i \ - $(srcdir)/../../../include -o splittree$(EXEEXT) Carbon.r \ + $(srcdir)/../../../include -o splittree Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -92,18 +89,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__splittree___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__splittree___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C splittree$(EXEEXT) +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C splittree @COND_PLATFORM_WIN32_1@__splittree___win32rc = splittree_sample_rc.o @COND_PLATFORM_MACOSX_1@__splittree_bundle___depname = splittree_bundle ### Targets: ### -all: splittree$(EXEEXT) $(__splittree_bundle___depname) +all: splittree $(__splittree_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f splittree$(EXEEXT) + rm -f splittree rm -rf splittree.app distclean: clean @@ -113,13 +110,13 @@ install: all install-strip: install -splittree$(EXEEXT): $(SPLITTREE_OBJECTS) $(__splittree___win32rc) +splittree: $(SPLITTREE_OBJECTS) $(__splittree___win32rc) $(CXX) -o $@ $(SPLITTREE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-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) $(__splittree___mac_rezcmd) $(__splittree___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -splittree.app/Contents: splittree$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +splittree.app/Contents: splittree $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p splittree.app/Contents mkdir -p splittree.app/Contents/MacOS mkdir -p splittree.app/Contents/Resources @@ -134,7 +131,7 @@ splittree.app/Contents: splittree$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $ echo -n "APPL????" >splittree.app/Contents/PkgInfo - ln -f splittree$(EXEEXT) splittree.app/Contents/MacOS/splittree + ln -f splittree splittree.app/Contents/MacOS/splittree ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc splittree.app/Contents/Resources/splittree.rsrc @@ -146,7 +143,7 @@ splittree_sample_rc.o: $(srcdir)/../../../../samples/sample.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 splittree_tree.o: $(srcdir)/tree.cpp - $(CXXC) -c -o $@ $(SPLITTREE_CXXFLAGS) $< + $(CXX) -c -o $@ $(SPLITTREE_CXXFLAGS) $< uninstall: diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in index 9326b09993..6dff9a45c5 100644 --- a/contrib/samples/mmedia/Makefile.in +++ b/contrib/samples/mmedia/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -45,8 +44,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -77,8 +74,7 @@ WX_VERSION = 2.5.0 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 -i $(srcdir)/../../include -o \ - mmboard$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - sample.r + mmboard Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) @@ -92,19 +88,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__mmboard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__mmboard___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C mmboard$(EXEEXT) +@COND_PLATFORM_MAC_1@__mmboard___mac_setfilecmd = $(SETFILE) -a C mmboard @COND_PLATFORM_WIN32_1@__mmboard___win32rc = mmboard_mmboard_rc.o @COND_PLATFORM_MACOSX_1@__mmboard_bundle___depname = mmboard_bundle ### Targets: ### -all: mmboard$(EXEEXT) $(__mmboard_bundle___depname) +all: mmboard $(__mmboard_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f mmboard$(EXEEXT) + rm -f mmboard rm -rf mmboard.app distclean: clean @@ -114,13 +109,13 @@ install: all install-strip: install -mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc) +mmboard: $(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) $(__mmboard___mac_rezcmd) $(__mmboard___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -mmboard.app/Contents: mmboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +mmboard.app/Contents: mmboard $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p mmboard.app/Contents mkdir -p mmboard.app/Contents/MacOS mkdir -p mmboard.app/Contents/Resources @@ -135,7 +130,7 @@ mmboard.app/Contents: mmboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >mmboard.app/Contents/PkgInfo - ln -f mmboard$(EXEEXT) mmboard.app/Contents/MacOS/mmboard + ln -f mmboard mmboard.app/Contents/MacOS/mmboard ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mmboard.app/Contents/Resources/mmboard.rsrc @@ -144,10 +139,10 @@ mmboard.app/Contents: mmboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@mmboard_bundle: mmboard.app/Contents mmboard_mmbman.o: $(srcdir)/mmbman.cpp - $(CXXC) -c -o $@ $(MMBOARD_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMBOARD_CXXFLAGS) $< mmboard_mmboard.o: $(srcdir)/mmboard.cpp - $(CXXC) -c -o $@ $(MMBOARD_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMBOARD_CXXFLAGS) $< mmboard_mmboard_rc.o: $(srcdir)/mmboard.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 --include-dir $(srcdir)/../../include diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in index 8f3fe91109..ad33fb49b7 100644 --- a/contrib/samples/ogl/ogledit/Makefile.in +++ b/contrib/samples/ogl/ogledit/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -47,8 +46,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -79,7 +76,7 @@ WX_VERSION = 2.5.0 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 -i \ - $(srcdir)/../../../include -o ogledit$(EXEEXT) Carbon.r \ + $(srcdir)/../../../include -o ogledit Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -94,19 +91,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__ogledit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__ogledit___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C ogledit$(EXEEXT) +@COND_PLATFORM_MAC_1@__ogledit___mac_setfilecmd = $(SETFILE) -a C ogledit @COND_PLATFORM_WIN32_1@__ogledit___win32rc = ogledit_ogledit_rc.o @COND_PLATFORM_MACOSX_1@__ogledit_bundle___depname = ogledit_bundle ### Targets: ### -all: ogledit$(EXEEXT) $(__ogledit_bundle___depname) +all: ogledit $(__ogledit_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f ogledit$(EXEEXT) + rm -f ogledit rm -rf ogledit.app distclean: clean @@ -116,13 +112,13 @@ install: all install-strip: install -ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc) +ogledit: $(OGLEDIT_OBJECTS) $(__ogledit___win32rc) $(CXX) -o $@ $(OGLEDIT_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_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) $(__ogledit___mac_rezcmd) $(__ogledit___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -ogledit.app/Contents: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +ogledit.app/Contents: ogledit $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p ogledit.app/Contents mkdir -p ogledit.app/Contents/MacOS mkdir -p ogledit.app/Contents/Resources @@ -137,7 +133,7 @@ ogledit.app/Contents: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >ogledit.app/Contents/PkgInfo - ln -f ogledit$(EXEEXT) ogledit.app/Contents/MacOS/ogledit + ln -f ogledit ogledit.app/Contents/MacOS/ogledit ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc ogledit.app/Contents/Resources/ogledit.rsrc @@ -146,19 +142,19 @@ ogledit.app/Contents: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@ogledit_bundle: ogledit.app/Contents ogledit_doc.o: $(srcdir)/doc.cpp - $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $< ogledit_ogledit.o: $(srcdir)/ogledit.cpp - $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $< ogledit_ogledit_rc.o: $(srcdir)/ogledit.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 --include-dir $(srcdir)/../../../include ogledit_palette.o: $(srcdir)/palette.cpp - $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $< ogledit_view.o: $(srcdir)/view.cpp - $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $< uninstall: diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in index 0ff8f53d54..631d77b402 100644 --- a/contrib/samples/ogl/studio/Makefile.in +++ b/contrib/samples/ogl/studio/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -53,8 +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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -85,7 +82,7 @@ WX_VERSION = 2.5.0 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 -i \ - $(srcdir)/../../../include -o studio$(EXEEXT) Carbon.r \ + $(srcdir)/../../../include -o studio Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -103,19 +100,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__studio___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__studio___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C studio$(EXEEXT) +@COND_PLATFORM_MAC_1@__studio___mac_setfilecmd = $(SETFILE) -a C studio @COND_PLATFORM_WIN32_1@__studio___win32rc = studio_studio_rc.o @COND_PLATFORM_MACOSX_1@__studio_bundle___depname = studio_bundle ### Targets: ### -all: studio$(EXEEXT) $(__studio_bundle___depname) data +all: studio $(__studio_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f studio$(EXEEXT) + rm -f studio rm -rf studio.app data: @@ -133,13 +129,13 @@ install: all install-strip: install -studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc) +studio: $(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) $(__studio___mac_rezcmd) $(__studio___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -studio.app/Contents: studio$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +studio.app/Contents: studio $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p studio.app/Contents mkdir -p studio.app/Contents/MacOS mkdir -p studio.app/Contents/Resources @@ -154,7 +150,7 @@ studio.app/Contents: studio$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >studio.app/Contents/PkgInfo - ln -f studio$(EXEEXT) studio.app/Contents/MacOS/studio + ln -f studio studio.app/Contents/MacOS/studio ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc studio.app/Contents/Resources/studio.rsrc @@ -163,37 +159,37 @@ studio.app/Contents: studio$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI @COND_PLATFORM_MACOSX_1@studio_bundle: studio.app/Contents studio_cspalette.o: $(srcdir)/cspalette.cpp - $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< studio_csprint.o: $(srcdir)/csprint.cpp - $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< studio_dialogs.o: $(srcdir)/dialogs.cpp - $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< studio_doc.o: $(srcdir)/doc.cpp - $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< studio_mainfrm.o: $(srcdir)/mainfrm.cpp - $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< studio_project.o: $(srcdir)/project.cpp - $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< studio_shapes.o: $(srcdir)/shapes.cpp - $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< studio_studio.o: $(srcdir)/studio.cpp - $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< studio_studio_rc.o: $(srcdir)/studio.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 --include-dir $(srcdir)/../../../include studio_symbols.o: $(srcdir)/symbols.cpp - $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< studio_view.o: $(srcdir)/view.cpp - $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< uninstall: diff --git a/contrib/samples/ogl/studio/makefile.wat b/contrib/samples/ogl/studio/makefile.wat index 1009b80bf5..7b43070091 100644 --- a/contrib/samples/ogl/studio/makefile.wat +++ b/contrib/samples/ogl/studio/makefile.wat @@ -242,7 +242,7 @@ $(OBJS)\studio.exe : $(STUDIO_OBJECTS) $(OBJS)\studio_studio.res @%create $(OBJS)\studio.lbc @%append $(OBJS)\studio.lbc option quiet @%append $(OBJS)\studio.lbc name $^@ - @%append $(OBJS)\studio.lbc option incremental + @%append $(OBJS)\studio.lbc option caseexact @%append $(OBJS)\studio.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' @for %i in ($(STUDIO_OBJECTS)) do @%append $(OBJS)\studio.lbc file %i @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\studio.lbc library %i diff --git a/contrib/samples/plot/Makefile.in b/contrib/samples/plot/Makefile.in index 134c983200..147fe9cc8d 100644 --- a/contrib/samples/plot/Makefile.in +++ b/contrib/samples/plot/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,7 +73,7 @@ WX_VERSION = 2.5.0 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 -i $(srcdir)/../../include -o \ - plot$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + plot Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__plot___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__plot___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C plot$(EXEEXT) +@COND_PLATFORM_MAC_1@__plot___mac_setfilecmd = $(SETFILE) -a C plot @COND_PLATFORM_WIN32_1@__plot___win32rc = plot_plot_rc.o @COND_PLATFORM_MACOSX_1@__plot_bundle___depname = plot_bundle ### Targets: ### -all: plot$(EXEEXT) $(__plot_bundle___depname) +all: plot $(__plot_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f plot$(EXEEXT) + rm -f plot rm -rf plot.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -plot$(EXEEXT): $(PLOT_OBJECTS) $(__plot___win32rc) +plot: $(PLOT_OBJECTS) $(__plot___win32rc) $(CXX) -o $@ $(PLOT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-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) $(__plot___mac_rezcmd) $(__plot___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -plot.app/Contents: plot$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +plot.app/Contents: plot $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p plot.app/Contents mkdir -p plot.app/Contents/MacOS mkdir -p plot.app/Contents/Resources @@ -133,7 +129,7 @@ plot.app/Contents: plot$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM echo -n "APPL????" >plot.app/Contents/PkgInfo - ln -f plot$(EXEEXT) plot.app/Contents/MacOS/plot + ln -f plot plot.app/Contents/MacOS/plot ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc plot.app/Contents/Resources/plot.rsrc @@ -142,7 +138,7 @@ plot.app/Contents: plot$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM @COND_PLATFORM_MACOSX_1@plot_bundle: plot.app/Contents plot_plot.o: $(srcdir)/plot.cpp - $(CXXC) -c -o $@ $(PLOT_CXXFLAGS) $< + $(CXX) -c -o $@ $(PLOT_CXXFLAGS) $< plot_plot_rc.o: $(srcdir)/plot.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 --include-dir $(srcdir)/../../include diff --git a/contrib/samples/stc/Makefile.in b/contrib/samples/stc/Makefile.in index a309b229ad..575ad37778 100644 --- a/contrib/samples/stc/Makefile.in +++ b/contrib/samples/stc/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,8 +73,7 @@ WX_VERSION = 2.5.0 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 -i $(srcdir)/../../include -o \ - stctest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - sample.r + stctest Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) @@ -91,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__stctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__stctest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C stctest$(EXEEXT) +@COND_PLATFORM_MAC_1@__stctest___mac_setfilecmd = $(SETFILE) -a C stctest @COND_PLATFORM_WIN32_1@__stctest___win32rc = stctest_sample_rc.o @COND_PLATFORM_MACOSX_1@__stctest_bundle___depname = stctest_bundle ### Targets: ### -all: stctest$(EXEEXT) $(__stctest_bundle___depname) data +all: stctest $(__stctest_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f stctest$(EXEEXT) + rm -f stctest rm -rf stctest.app data: @@ -121,13 +116,13 @@ install: all install-strip: install -stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc) +stctest: $(STCTEST_OBJECTS) $(__stctest___win32rc) $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-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) $(__stctest___mac_rezcmd) $(__stctest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -stctest.app/Contents: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +stctest.app/Contents: stctest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p stctest.app/Contents mkdir -p stctest.app/Contents/MacOS mkdir -p stctest.app/Contents/Resources @@ -142,7 +137,7 @@ stctest.app/Contents: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >stctest.app/Contents/PkgInfo - ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest + ln -f stctest stctest.app/Contents/MacOS/stctest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc stctest.app/Contents/Resources/stctest.rsrc @@ -154,7 +149,7 @@ stctest_sample_rc.o: $(srcdir)/../../../samples/sample.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 stctest_stctest.o: $(srcdir)/stctest.cpp - $(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $< uninstall: diff --git a/contrib/samples/svg/Makefile.in b/contrib/samples/svg/Makefile.in index f9074ad528..7e1ed86756 100644 --- a/contrib/samples/svg/Makefile.in +++ b/contrib/samples/svg/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,8 +73,7 @@ WX_VERSION = 2.5.0 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 -i $(srcdir)/../../include -o \ - svgtest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - sample.r + svgtest Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) @@ -91,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__svgtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__svgtest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C svgtest$(EXEEXT) +@COND_PLATFORM_MAC_1@__svgtest___mac_setfilecmd = $(SETFILE) -a C svgtest @COND_PLATFORM_WIN32_1@__svgtest___win32rc = svgtest_sample_rc.o @COND_PLATFORM_MACOSX_1@__svgtest_bundle___depname = svgtest_bundle ### Targets: ### -all: svgtest$(EXEEXT) $(__svgtest_bundle___depname) +all: svgtest $(__svgtest_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f svgtest$(EXEEXT) + rm -f svgtest rm -rf svgtest.app distclean: clean @@ -113,13 +108,13 @@ install: all install-strip: install -svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc) +svgtest: $(SVGTEST_OBJECTS) $(__svgtest___win32rc) $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-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) $(__svgtest___mac_rezcmd) $(__svgtest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -svgtest.app/Contents: svgtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +svgtest.app/Contents: svgtest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p svgtest.app/Contents mkdir -p svgtest.app/Contents/MacOS mkdir -p svgtest.app/Contents/Resources @@ -134,7 +129,7 @@ svgtest.app/Contents: svgtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >svgtest.app/Contents/PkgInfo - ln -f svgtest$(EXEEXT) svgtest.app/Contents/MacOS/svgtest + ln -f svgtest svgtest.app/Contents/MacOS/svgtest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc svgtest.app/Contents/Resources/svgtest.rsrc @@ -146,7 +141,7 @@ svgtest_sample_rc.o: $(srcdir)/../../../samples/sample.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 svgtest_svgtest.o: $(srcdir)/svgtest.cpp - $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(SVGTEST_CXXFLAGS) $< uninstall: diff --git a/contrib/samples/xrc/Makefile.in b/contrib/samples/xrc/Makefile.in index b3df86261c..fcdee820b9 100644 --- a/contrib/samples/xrc/Makefile.in +++ b/contrib/samples/xrc/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -47,8 +46,6 @@ XRCDEMO_OBJECTS = \ ### Conditionally set variables: ### -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -79,8 +76,7 @@ XRCDEMO_OBJECTS = \ 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 -i $(srcdir)/../../include -o \ - xrcdemo$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - sample.r + xrcdemo Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) @@ -99,19 +95,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__xrcdemo___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C xrcdemo$(EXEEXT) +@COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = $(SETFILE) -a C xrcdemo @COND_PLATFORM_WIN32_1@__xrcdemo___win32rc = xrcdemo_xrcdemo_rc.o @COND_PLATFORM_MACOSX_1@__xrcdemo_bundle___depname = xrcdemo_bundle ### Targets: ### -all: xrcdemo$(EXEEXT) $(__xrcdemo_bundle___depname) data +all: xrcdemo $(__xrcdemo_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f xrcdemo$(EXEEXT) + rm -f xrcdemo rm -rf xrcdemo.app data: @@ -131,13 +126,13 @@ install-strip: install uninstall: -xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) +xrcdemo: $(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) $(__xrcdemo___mac_rezcmd) $(__xrcdemo___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -xrcdemo.app/Contents: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +xrcdemo.app/Contents: xrcdemo $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p xrcdemo.app/Contents mkdir -p xrcdemo.app/Contents/MacOS mkdir -p xrcdemo.app/Contents/Resources @@ -152,7 +147,7 @@ xrcdemo.app/Contents: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >xrcdemo.app/Contents/PkgInfo - ln -f xrcdemo$(EXEEXT) xrcdemo.app/Contents/MacOS/xrcdemo + ln -f xrcdemo xrcdemo.app/Contents/MacOS/xrcdemo ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc xrcdemo.app/Contents/Resources/xrcdemo.rsrc @@ -161,16 +156,16 @@ xrcdemo.app/Contents: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@xrcdemo_bundle: xrcdemo.app/Contents xrcdemo_custclas.o: $(srcdir)/custclas.cpp - $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< xrcdemo_derivdlg.o: $(srcdir)/derivdlg.cpp - $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< xrcdemo_myframe.o: $(srcdir)/myframe.cpp - $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp - $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.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 --include-dir $(srcdir)/../../include diff --git a/contrib/src/animate/Makefile.in b/contrib/src/animate/Makefile.in index 4d0699b789..d79f10b1f8 100644 --- a/contrib/src/animate/Makefile.in +++ b/contrib/src/animate/Makefile.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) @@ -104,43 +96,43 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_GCC_PCH_1@ .pch/wxprec_animatedll/wx/wxprec.h.gch @COND_GCC_PCH_1@__animatedll_PCH_INC = -I.pch/wxprec_animatedll COND_SHARED_1___animatedll___depname = \ - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) + $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) @COND_SHARED_1@__animatedll___depname = $(COND_SHARED_1___animatedll___depname) COND_PLATFORM_WIN32_1___animatedll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_PLATFORM_WIN32_1@__animatedll___importlib = $(COND_PLATFORM_WIN32_1___animatedll___importlib) COND_PLATFORM_MACOSX_1___animatedll___macinstnamecmd = -install_name \ - $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) + $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) @COND_PLATFORM_MACOSX_1@__animatedll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___animatedll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__animatedll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ @COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) COND_USE_SOSYMLINKS_1___animatedll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \ -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).$(SO_SUFFIX)) @COND_USE_SOSYMLINKS_1@__animatedll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___animatedll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___animatedll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_USE_SOSYMLINKS_1@__animatedll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___animatedll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___animatedll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) @COND_USE_SOVERLINUX_1@__animatedll___soname_flags = $(COND_USE_SOVERLINUX_1___animatedll___soname_flags) COND_USE_SOVERSOLARIS_1___animatedll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__animatedll___soname_flags = $(COND_USE_SOVERSOLARIS_1___animatedll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__animatedll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @@ -171,12 +163,12 @@ all: $(__animatedll___depname) $(__animatelib___depname) @COND_GCC_PCH_1@.pch/wxprec_animatelib/wx/wxprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_animatelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ANIMATELIB_CXXFLAGS) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3): $(__animatedll_PCH_DEP) $(ANIMATEDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3): $(__animatedll_PCH_DEP) $(ANIMATEDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__animatedll___macinstnamecmd) $(__animatedll___importlib) $(__animatedll___soname_flags) $(__animatedll___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@ $(__animatedll___so_symlinks_cmd) animatedll_animate.o: $(srcdir)/animate.cpp - $(CXXC) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $< @COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a: $(__animatelib_PCH_DEP) $(ANIMATELIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @@ -184,40 +176,40 @@ animatedll_animate.o: $(srcdir)/animate.cpp @COND_SHARED_0@ $(RANLIB) $@ animatelib_animate.o: $(srcdir)/animate.cpp - $(CXXC) -c -o $@ $(ANIMATELIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(ANIMATELIB_CXXFLAGS) $< clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) + rm -f $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).$(SO_SUFFIX) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-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_animatedll___depname) $(__install_animatelib___depname) - $(INSTALL_DIR) $(includedir) + $(INSTALL) -d $(includedir) for f in wx/animate/animate.h; 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)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) + $(STRIP) $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) @COND_SHARED_1@install_animatedll: -@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL) -d $(libdir) +@COND_SHARED_1@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(libdir) +@COND_SHARED_1@ install -c $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__animatedll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_animatelib: -@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL) -d $(libdir) +@COND_SHARED_0@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a $(libdir) uninstall: diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in index 8ff9cebb61..2a943c56e5 100644 --- a/contrib/src/deprecated/Makefile.in +++ b/contrib/src/deprecated/Makefile.in @@ -16,13 +16,9 @@ CFLAGS = @CFLAGS@ 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@ @@ -80,12 +76,6 @@ WX_VERSION = 2.5.0 ### Conditionally set variables: ### -@COND_DEPS_TRACKING_0@CCC = $(CC) -@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) -@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) @@ -130,43 +120,43 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_GCC_PCH_1@ .pch/wxprec_deprecateddll/wx/wxprec.h.gch @COND_GCC_PCH_1@__deprecateddll_PCH_INC = -I.pch/wxprec_deprecateddll COND_SHARED_1___deprecateddll___depname = \ - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) + $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) @COND_SHARED_1@__deprecateddll___depname = $(COND_SHARED_1___deprecateddll___depname) COND_PLATFORM_WIN32_1___deprecateddll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_PLATFORM_WIN32_1@__deprecateddll___importlib = $(COND_PLATFORM_WIN32_1___deprecateddll___importlib) COND_PLATFORM_MACOSX_1___deprecateddll___macinstnamecmd = -install_name \ - $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) + $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) @COND_PLATFORM_MACOSX_1@__deprecateddll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___deprecateddll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__deprecateddll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ @COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; \ rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).$(SO_SUFFIX)) @COND_USE_SOSYMLINKS_1@__deprecateddll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_USE_SOSYMLINKS_1@__deprecateddll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___deprecateddll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) @COND_USE_SOVERLINUX_1@__deprecateddll___soname_flags = $(COND_USE_SOVERLINUX_1___deprecateddll___soname_flags) COND_USE_SOVERSOLARIS_1___deprecateddll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__deprecateddll___soname_flags = $(COND_USE_SOVERSOLARIS_1___deprecateddll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__deprecateddll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @@ -200,38 +190,38 @@ all: $(__deprecateddll___depname) $(__deprecatedlib___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) + rm -f $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).$(SO_SUFFIX) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(__deprecateddll_PCH_DEP) $(DEPRECATEDDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(__deprecateddll_PCH_DEP) $(DEPRECATEDDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(__deprecateddll___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@ $(__deprecateddll___so_symlinks_cmd) deprecateddll_dosyacc.o: $(srcdir)/dosyacc.c - $(CCC) -c -o $@ $(DEPRECATEDDLL_CFLAGS) $< + $(CC) -c -o $@ $(DEPRECATEDDLL_CFLAGS) $< deprecateddll_prop.o: $(srcdir)/prop.cpp - $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< deprecateddll_propform.o: $(srcdir)/propform.cpp - $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< deprecateddll_proplist.o: $(srcdir)/proplist.cpp - $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< deprecateddll_resource.o: $(srcdir)/resource.cpp - $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< deprecateddll_tbarsmpl.o: $(srcdir)/tbarsmpl.cpp - $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< deprecateddll_treelay.o: $(srcdir)/treelay.cpp - $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< deprecateddll_wxexpr.o: $(srcdir)/wxexpr.cpp - $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< @COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a: $(__deprecatedlib_PCH_DEP) $(DEPRECATEDLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @@ -239,53 +229,53 @@ deprecateddll_wxexpr.o: $(srcdir)/wxexpr.cpp @COND_SHARED_0@ $(RANLIB) $@ deprecatedlib_dosyacc.o: $(srcdir)/dosyacc.c - $(CCC) -c -o $@ $(DEPRECATEDLIB_CFLAGS) $< + $(CC) -c -o $@ $(DEPRECATEDLIB_CFLAGS) $< deprecatedlib_prop.o: $(srcdir)/prop.cpp - $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< deprecatedlib_propform.o: $(srcdir)/propform.cpp - $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< deprecatedlib_proplist.o: $(srcdir)/proplist.cpp - $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< deprecatedlib_resource.o: $(srcdir)/resource.cpp - $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< deprecatedlib_tbarsmpl.o: $(srcdir)/tbarsmpl.cpp - $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< deprecatedlib_treelay.o: $(srcdir)/treelay.cpp - $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< deprecatedlib_wxexpr.o: $(srcdir)/wxexpr.cpp - $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname) - $(INSTALL_DIR) $(includedir) + $(INSTALL) -d $(includedir) for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; 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)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) + $(STRIP) $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) @COND_SHARED_1@install_deprecateddll: -@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL) -d $(libdir) +@COND_SHARED_1@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(libdir) +@COND_SHARED_1@ install -c $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__deprecateddll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_deprecatedlib: -@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL) -d $(libdir) +@COND_SHARED_0@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a $(libdir) uninstall: diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in index 7407c24c23..81ba23feb6 100644 --- a/contrib/src/fl/Makefile.in +++ b/contrib/src/fl/Makefile.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@ @@ -88,10 +84,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) @@ -135,42 +127,42 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_GCC_PCH_1@__fldll_PCH_DEP = .pch/wxprec_fldll/wx/wxprec.h.gch @COND_GCC_PCH_1@__fldll_PCH_INC = -I.pch/wxprec_fldll COND_SHARED_1___fldll___depname = \ - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) + $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) @COND_SHARED_1@__fldll___depname = $(COND_SHARED_1___fldll___depname) COND_PLATFORM_WIN32_1___fldll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_PLATFORM_WIN32_1@__fldll___importlib = $(COND_PLATFORM_WIN32_1___fldll___importlib) COND_PLATFORM_MACOSX_1___fldll___macinstnamecmd = -install_name \ - $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) + $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) @COND_PLATFORM_MACOSX_1@__fldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___fldll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__fldll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ @COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) COND_USE_SOSYMLINKS_1___fldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).$(SO_SUFFIX)) @COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___fldll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___fldll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) @COND_USE_SOVERLINUX_1@__fldll___soname_flags = $(COND_USE_SOVERLINUX_1___fldll___soname_flags) COND_USE_SOVERSOLARIS_1___fldll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__fldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___fldll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__fldll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @@ -203,68 +195,68 @@ all: $(__fldll___depname) $(__fllib___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) + rm -f $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).$(SO_SUFFIX) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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 -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): $(__fldll_PCH_DEP) $(FLDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): $(__fldll_PCH_DEP) $(FLDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(FLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__fldll___macinstnamecmd) $(__fldll___importlib) $(__fldll___soname_flags) $(__fldll___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@ $(__fldll___so_symlinks_cmd) fldll_antiflickpl.o: $(srcdir)/antiflickpl.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_bardragpl.o: $(srcdir)/bardragpl.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_barhintspl.o: $(srcdir)/barhintspl.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_cbcustom.o: $(srcdir)/cbcustom.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_controlbar.o: $(srcdir)/controlbar.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_dyntbar.o: $(srcdir)/dyntbar.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_dyntbarhnd.o: $(srcdir)/dyntbarhnd.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_frmview.o: $(srcdir)/frmview.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_garbagec.o: $(srcdir)/garbagec.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_gcupdatesmgr.o: $(srcdir)/gcupdatesmgr.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_hintanimpl.o: $(srcdir)/hintanimpl.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_newbmpbtn.o: $(srcdir)/newbmpbtn.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_panedrawpl.o: $(srcdir)/panedrawpl.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_rowdragpl.o: $(srcdir)/rowdragpl.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_rowlayoutpl.o: $(srcdir)/rowlayoutpl.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_toolwnd.o: $(srcdir)/toolwnd.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< fldll_updatesmgr.o: $(srcdir)/updatesmgr.cpp - $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< @COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a: $(__fllib_PCH_DEP) $(FLLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @@ -272,77 +264,77 @@ fldll_updatesmgr.o: $(srcdir)/updatesmgr.cpp @COND_SHARED_0@ $(RANLIB) $@ fllib_antiflickpl.o: $(srcdir)/antiflickpl.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_bardragpl.o: $(srcdir)/bardragpl.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_barhintspl.o: $(srcdir)/barhintspl.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_cbcustom.o: $(srcdir)/cbcustom.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_controlbar.o: $(srcdir)/controlbar.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_dyntbar.o: $(srcdir)/dyntbar.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_dyntbarhnd.o: $(srcdir)/dyntbarhnd.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_frmview.o: $(srcdir)/frmview.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_garbagec.o: $(srcdir)/garbagec.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_gcupdatesmgr.o: $(srcdir)/gcupdatesmgr.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_hintanimpl.o: $(srcdir)/hintanimpl.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_newbmpbtn.o: $(srcdir)/newbmpbtn.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_panedrawpl.o: $(srcdir)/panedrawpl.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_rowdragpl.o: $(srcdir)/rowdragpl.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_rowlayoutpl.o: $(srcdir)/rowlayoutpl.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_toolwnd.o: $(srcdir)/toolwnd.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< fllib_updatesmgr.o: $(srcdir)/updatesmgr.cpp - $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< install: all $(__install_fldll___depname) $(__install_fllib___depname) - $(INSTALL_DIR) $(includedir) + $(INSTALL) -d $(includedir) for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; 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)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) + $(STRIP) $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) @COND_SHARED_1@install_fldll: -@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL) -d $(libdir) +@COND_SHARED_1@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(libdir) +@COND_SHARED_1@ install -c $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__fldll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_fllib: -@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL) -d $(libdir) +@COND_SHARED_0@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a $(libdir) uninstall: diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in index cc75c93097..212aa467de 100644 --- a/contrib/src/gizmos/Makefile.in +++ b/contrib/src/gizmos/Makefile.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@ @@ -66,10 +62,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) @@ -113,42 +105,42 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_GCC_PCH_1@__gizmosdll_PCH_DEP = .pch/wxprec_gizmosdll/wx/wxprec.h.gch @COND_GCC_PCH_1@__gizmosdll_PCH_INC = -I.pch/wxprec_gizmosdll COND_SHARED_1___gizmosdll___depname = \ - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) + $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) @COND_SHARED_1@__gizmosdll___depname = $(COND_SHARED_1___gizmosdll___depname) COND_PLATFORM_WIN32_1___gizmosdll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_PLATFORM_WIN32_1@__gizmosdll___importlib = $(COND_PLATFORM_WIN32_1___gizmosdll___importlib) COND_PLATFORM_MACOSX_1___gizmosdll___macinstnamecmd = -install_name \ - $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) + $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) @COND_PLATFORM_MACOSX_1@__gizmosdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___gizmosdll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__gizmosdll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ @COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).$(SO_SUFFIX)) @COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___gizmosdll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) @COND_USE_SOVERLINUX_1@__gizmosdll___soname_flags = $(COND_USE_SOVERLINUX_1___gizmosdll___soname_flags) COND_USE_SOVERSOLARIS_1___gizmosdll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__gizmosdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___gizmosdll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__gizmosdll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @@ -181,35 +173,35 @@ all: $(__gizmosdll___depname) $(__gizmoslib___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) + rm -f $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).$(SO_SUFFIX) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-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 -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3): $(__gizmosdll_PCH_DEP) $(GIZMOSDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3): $(__gizmosdll_PCH_DEP) $(GIZMOSDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(__gizmosdll___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_BASE_p) $(__WXLIB_CORE_p) @COND_SHARED_1@ $(__gizmosdll___so_symlinks_cmd) gizmosdll_dynamicsash.o: $(srcdir)/dynamicsash.cpp - $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< gizmosdll_editlbox.o: $(srcdir)/editlbox.cpp - $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< gizmosdll_ledctrl.o: $(srcdir)/ledctrl.cpp - $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< gizmosdll_multicell.o: $(srcdir)/multicell.cpp - $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< gizmosdll_splittree.o: $(srcdir)/splittree.cpp - $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< gizmosdll_statpict.o: $(srcdir)/statpict.cpp - $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< @COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a: $(__gizmoslib_PCH_DEP) $(GIZMOSLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @@ -217,44 +209,44 @@ gizmosdll_statpict.o: $(srcdir)/statpict.cpp @COND_SHARED_0@ $(RANLIB) $@ gizmoslib_dynamicsash.o: $(srcdir)/dynamicsash.cpp - $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< gizmoslib_editlbox.o: $(srcdir)/editlbox.cpp - $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< gizmoslib_ledctrl.o: $(srcdir)/ledctrl.cpp - $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< gizmoslib_multicell.o: $(srcdir)/multicell.cpp - $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< gizmoslib_splittree.o: $(srcdir)/splittree.cpp - $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< gizmoslib_statpict.o: $(srcdir)/statpict.cpp - $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname) - $(INSTALL_DIR) $(includedir) + $(INSTALL) -d $(includedir) for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h; 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)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) + $(STRIP) $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) @COND_SHARED_1@install_gizmosdll: -@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL) -d $(libdir) +@COND_SHARED_1@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(libdir) +@COND_SHARED_1@ install -c $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_gizmoslib: -@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL) -d $(libdir) +@COND_SHARED_0@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a $(libdir) uninstall: diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in index d2782c60e6..9aea6eca83 100644 --- a/contrib/src/mmedia/Makefile.in +++ b/contrib/src/mmedia/Makefile.in @@ -14,14 +14,10 @@ AR = @AR@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_ESD = @EXTRALIBS_ESD@ 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@ @@ -91,10 +87,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) @@ -158,42 +150,42 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_GCC_PCH_1@__mmediadll_PCH_DEP = .pch/wxprec_mmediadll/wx/wxprec.h.gch @COND_GCC_PCH_1@__mmediadll_PCH_INC = -I.pch/wxprec_mmediadll COND_SHARED_1___mmediadll___depname = \ - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) + $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) @COND_SHARED_1@__mmediadll___depname = $(COND_SHARED_1___mmediadll___depname) COND_PLATFORM_WIN32_1___mmediadll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_PLATFORM_WIN32_1@__mmediadll___importlib = $(COND_PLATFORM_WIN32_1___mmediadll___importlib) COND_PLATFORM_MACOSX_1___mmediadll___macinstnamecmd = -install_name \ - $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) + $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) @COND_PLATFORM_MACOSX_1@__mmediadll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___mmediadll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__mmediadll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ @COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).$(SO_SUFFIX)) @COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___mmediadll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) @COND_USE_SOVERLINUX_1@__mmediadll___soname_flags = $(COND_USE_SOVERLINUX_1___mmediadll___soname_flags) COND_USE_SOVERSOLARIS_1___mmediadll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__mmediadll___soname_flags = $(COND_USE_SOVERSOLARIS_1___mmediadll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__mmediadll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @@ -224,111 +216,111 @@ all: $(__mmediadll___depname) $(__mmedialib___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) + rm -f $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).$(SO_SUFFIX) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-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_mmediadll___depname) $(__install_mmedialib___depname) - $(INSTALL_DIR) $(includedir) + $(INSTALL) -d $(includedir) for f in wx/mmedia/cdbase.h wx/mmedia/cdunix.h wx/mmedia/cdwin.h wx/mmedia/sndaiff.h wx/mmedia/sndbase.h wx/mmedia/sndcodec.h wx/mmedia/sndcpcm.h wx/mmedia/sndesd.h wx/mmedia/sndfile.h wx/mmedia/sndg72x.h wx/mmedia/sndmsad.h wx/mmedia/sndoss.h wx/mmedia/sndpcm.h wx/mmedia/sndulaw.h wx/mmedia/sndwav.h wx/mmedia/sndwin.h wx/mmedia/vidbase.h wx/mmedia/vidwin.h wx/mmedia/vidxanm.h; 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)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) + $(STRIP) $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) @COND_SHARED_1@install_mmediadll: -@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL) -d $(libdir) +@COND_SHARED_1@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(libdir) +@COND_SHARED_1@ install -c $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__mmediadll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_mmedialib: -@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL) -d $(libdir) +@COND_SHARED_0@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a $(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(__mmediadll_PCH_DEP) $(MMEDIADLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(__mmediadll_PCH_DEP) $(MMEDIADLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(__mmediadll___macver) $(EXTRALIBS_ESD) $(__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@ $(__mmediadll___so_symlinks_cmd) mmediadll_cdbase.o: $(srcdir)/cdbase.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_cdunix.o: $(srcdir)/cdunix.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_cdwin.o: $(srcdir)/cdwin.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_g711.o: $(srcdir)/g711.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_g721.o: $(srcdir)/g721.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_g723_24.o: $(srcdir)/g723_24.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_g723_40.o: $(srcdir)/g723_40.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_g72x.o: $(srcdir)/g72x.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_sndaiff.o: $(srcdir)/sndaiff.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_sndbase.o: $(srcdir)/sndbase.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_sndcodec.o: $(srcdir)/sndcodec.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_sndcpcm.o: $(srcdir)/sndcpcm.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_sndesd.o: $(srcdir)/sndesd.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_sndfile.o: $(srcdir)/sndfile.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_sndg72x.o: $(srcdir)/sndg72x.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_sndmsad.o: $(srcdir)/sndmsad.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_sndoss.o: $(srcdir)/sndoss.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_sndpcm.o: $(srcdir)/sndpcm.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_sndulaw.o: $(srcdir)/sndulaw.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_sndwav.o: $(srcdir)/sndwav.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_sndwin.o: $(srcdir)/sndwin.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_vidbase.o: $(srcdir)/vidbase.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_vidwin.o: $(srcdir)/vidwin.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< mmediadll_vidxanm.o: $(srcdir)/vidxanm.cpp - $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< @COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a: $(__mmedialib_PCH_DEP) $(MMEDIALIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @@ -336,76 +328,76 @@ mmediadll_vidxanm.o: $(srcdir)/vidxanm.cpp @COND_SHARED_0@ $(RANLIB) $@ mmedialib_cdbase.o: $(srcdir)/cdbase.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_cdunix.o: $(srcdir)/cdunix.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_cdwin.o: $(srcdir)/cdwin.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_g711.o: $(srcdir)/g711.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_g721.o: $(srcdir)/g721.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_g723_24.o: $(srcdir)/g723_24.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_g723_40.o: $(srcdir)/g723_40.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_g72x.o: $(srcdir)/g72x.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_sndaiff.o: $(srcdir)/sndaiff.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_sndbase.o: $(srcdir)/sndbase.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_sndcodec.o: $(srcdir)/sndcodec.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_sndcpcm.o: $(srcdir)/sndcpcm.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_sndesd.o: $(srcdir)/sndesd.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_sndfile.o: $(srcdir)/sndfile.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_sndg72x.o: $(srcdir)/sndg72x.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_sndmsad.o: $(srcdir)/sndmsad.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_sndoss.o: $(srcdir)/sndoss.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_sndpcm.o: $(srcdir)/sndpcm.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_sndulaw.o: $(srcdir)/sndulaw.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_sndwav.o: $(srcdir)/sndwav.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_sndwin.o: $(srcdir)/sndwin.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_vidbase.o: $(srcdir)/vidbase.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_vidwin.o: $(srcdir)/vidwin.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< mmedialib_vidxanm.o: $(srcdir)/vidxanm.cpp - $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< uninstall: diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in index e00ba14934..48bb5551ff 100644 --- a/contrib/src/net/Makefile.in +++ b/contrib/src/net/Makefile.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@ @@ -60,10 +56,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) @@ -110,43 +102,43 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_GCC_PCH_1@ .pch/wxprec_netutilsdll/wx/wxprec.h.gch @COND_GCC_PCH_1@__netutilsdll_PCH_INC = -I.pch/wxprec_netutilsdll COND_SHARED_1___netutilsdll___depname = \ - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) + $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) @COND_SHARED_1@__netutilsdll___depname = $(COND_SHARED_1___netutilsdll___depname) COND_PLATFORM_WIN32_1___netutilsdll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_PLATFORM_WIN32_1@__netutilsdll___importlib = $(COND_PLATFORM_WIN32_1___netutilsdll___importlib) COND_PLATFORM_MACOSX_1___netutilsdll___macinstnamecmd = -install_name \ - $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) + $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) @COND_PLATFORM_MACOSX_1@__netutilsdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___netutilsdll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__netutilsdll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ @COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \ -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).$(SO_SUFFIX)) @COND_USE_SOSYMLINKS_1@__netutilsdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_USE_SOSYMLINKS_1@__netutilsdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___netutilsdll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) @COND_USE_SOVERLINUX_1@__netutilsdll___soname_flags = $(COND_USE_SOVERLINUX_1___netutilsdll___soname_flags) COND_USE_SOVERSOLARIS_1___netutilsdll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__netutilsdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___netutilsdll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__netutilsdll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @@ -178,48 +170,48 @@ all: $(__netutilsdll___depname) $(__netutilslib___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) + rm -f $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).$(SO_SUFFIX) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-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_netutilsdll___depname) $(__install_netutilslib___depname) - $(INSTALL_DIR) $(includedir) + $(INSTALL) -d $(includedir) for f in wx/net/email.h wx/net/msg.h wx/net/smapi.h wx/net/web.h; 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)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) + $(STRIP) $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) @COND_SHARED_1@install_netutilsdll: -@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL) -d $(libdir) +@COND_SHARED_1@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(libdir) +@COND_SHARED_1@ install -c $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__netutilsdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_netutilslib: -@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL) -d $(libdir) +@COND_SHARED_0@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a $(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3): $(__netutilsdll_PCH_DEP) $(NETUTILSDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3): $(__netutilsdll_PCH_DEP) $(NETUTILSDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__netutilsdll___macinstnamecmd) $(__netutilsdll___importlib) $(__netutilsdll___soname_flags) $(__netutilsdll___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@ $(__netutilsdll___so_symlinks_cmd) netutilsdll_email.o: $(srcdir)/email.cpp - $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< netutilsdll_smapi.o: $(srcdir)/smapi.cpp - $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< netutilsdll_web.o: $(srcdir)/web.cpp - $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< @COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a: $(__netutilslib_PCH_DEP) $(NETUTILSLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @@ -227,13 +219,13 @@ netutilsdll_web.o: $(srcdir)/web.cpp @COND_SHARED_0@ $(RANLIB) $@ netutilslib_email.o: $(srcdir)/email.cpp - $(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< netutilslib_smapi.o: $(srcdir)/smapi.cpp - $(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< netutilslib_web.o: $(srcdir)/web.cpp - $(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< uninstall: diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in index ae529753f5..66c73d10d8 100644 --- a/contrib/src/ogl/Makefile.in +++ b/contrib/src/ogl/Makefile.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@ @@ -78,10 +74,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) @@ -127,42 +119,42 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_GCC_PCH_1@__ogldll_PCH_DEP = .pch/wxprec_ogldll/wx/wxprec.h.gch @COND_GCC_PCH_1@__ogldll_PCH_INC = -I.pch/wxprec_ogldll COND_SHARED_1___ogldll___depname = \ - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) + $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) @COND_SHARED_1@__ogldll___depname = $(COND_SHARED_1___ogldll___depname) COND_PLATFORM_WIN32_1___ogldll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_PLATFORM_WIN32_1@__ogldll___importlib = $(COND_PLATFORM_WIN32_1___ogldll___importlib) COND_PLATFORM_MACOSX_1___ogldll___macinstnamecmd = -install_name \ - $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) + $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) @COND_PLATFORM_MACOSX_1@__ogldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___ogldll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__ogldll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ @COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).$(SO_SUFFIX)) @COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___ogldll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) @COND_USE_SOVERLINUX_1@__ogldll___soname_flags = $(COND_USE_SOVERLINUX_1___ogldll___soname_flags) COND_USE_SOVERSOLARIS_1___ogldll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__ogldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___ogldll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__ogldll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @@ -193,75 +185,75 @@ all: $(__ogldll___depname) $(__ogllib___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) + rm -f $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).$(SO_SUFFIX) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-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_ogldll___depname) $(__install_ogllib___depname) - $(INSTALL_DIR) $(includedir) + $(INSTALL) -d $(includedir) for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; 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)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) + $(STRIP) $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) @COND_SHARED_1@install_ogldll: -@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL) -d $(libdir) +@COND_SHARED_1@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(libdir) +@COND_SHARED_1@ install -c $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__ogldll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_ogllib: -@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL) -d $(libdir) +@COND_SHARED_0@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a $(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(__ogldll_PCH_DEP) $(OGLDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(__ogldll_PCH_DEP) $(OGLDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(__ogldll___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@ $(__ogldll___so_symlinks_cmd) ogldll_basic.o: $(srcdir)/basic.cpp - $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< ogldll_basic2.o: $(srcdir)/basic2.cpp - $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< ogldll_bmpshape.o: $(srcdir)/bmpshape.cpp - $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< ogldll_canvas.o: $(srcdir)/canvas.cpp - $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< ogldll_composit.o: $(srcdir)/composit.cpp - $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< ogldll_constrnt.o: $(srcdir)/constrnt.cpp - $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< ogldll_divided.o: $(srcdir)/divided.cpp - $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< ogldll_drawn.o: $(srcdir)/drawn.cpp - $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< ogldll_lines.o: $(srcdir)/lines.cpp - $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< ogldll_mfutils.o: $(srcdir)/mfutils.cpp - $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< ogldll_ogldiag.o: $(srcdir)/ogldiag.cpp - $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< ogldll_oglmisc.o: $(srcdir)/oglmisc.cpp - $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< @COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a: $(__ogllib_PCH_DEP) $(OGLLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @@ -269,40 +261,40 @@ ogldll_oglmisc.o: $(srcdir)/oglmisc.cpp @COND_SHARED_0@ $(RANLIB) $@ ogllib_basic.o: $(srcdir)/basic.cpp - $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< ogllib_basic2.o: $(srcdir)/basic2.cpp - $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< ogllib_bmpshape.o: $(srcdir)/bmpshape.cpp - $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< ogllib_canvas.o: $(srcdir)/canvas.cpp - $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< ogllib_composit.o: $(srcdir)/composit.cpp - $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< ogllib_constrnt.o: $(srcdir)/constrnt.cpp - $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< ogllib_divided.o: $(srcdir)/divided.cpp - $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< ogllib_drawn.o: $(srcdir)/drawn.cpp - $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< ogllib_lines.o: $(srcdir)/lines.cpp - $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< ogllib_mfutils.o: $(srcdir)/mfutils.cpp - $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< ogllib_ogldiag.o: $(srcdir)/ogldiag.cpp - $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< ogllib_oglmisc.o: $(srcdir)/oglmisc.cpp - $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< uninstall: diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in index 6804723a10..9c61c6836c 100644 --- a/contrib/src/plot/Makefile.in +++ b/contrib/src/plot/Makefile.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: diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in index c09d28eb85..b60d1e622b 100644 --- a/contrib/src/stc/Makefile.in +++ b/contrib/src/stc/Makefile.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@ @@ -155,10 +151,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) @@ -202,42 +194,42 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_SHARED_1@__install_stcdll___depname = install_stcdll @COND_SHARED_0@__install_stclib___depname = install_stclib COND_SHARED_1___stcdll___depname = \ - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) + $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) @COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname) COND_PLATFORM_WIN32_1___stcdll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_PLATFORM_WIN32_1@__stcdll___importlib = $(COND_PLATFORM_WIN32_1___stcdll___importlib) COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd = -install_name \ - $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) + $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) @COND_PLATFORM_MACOSX_1@__stcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__stcdll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ @COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX)) @COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___stcdll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) @COND_USE_SOVERLINUX_1@__stcdll___soname_flags = $(COND_USE_SOVERLINUX_1___stcdll___soname_flags) COND_USE_SOVERSOLARIS_1___stcdll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__stcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___stcdll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__stcdll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @@ -260,186 +252,186 @@ all: $(__stcdll___depname) $(__stclib___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) + rm -f $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-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_stcdll___depname) $(__install_stclib___depname) - $(INSTALL_DIR) $(includedir) + $(INSTALL) -d $(includedir) for f in wx/stc/stc.h; 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)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) + $(STRIP) $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) @COND_SHARED_1@install_stcdll: -@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL) -d $(libdir) +@COND_SHARED_1@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(libdir) +@COND_SHARED_1@ install -c $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__stcdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_stclib: -@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL) -d $(libdir) +@COND_SHARED_0@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a $(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(__stcdll___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@ $(__stcdll___so_symlinks_cmd) stcdll_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_CallTip.o: $(srcdir)/scintilla/src/CallTip.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_CellBuffer.o: $(srcdir)/scintilla/src/CellBuffer.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_ContractionState.o: $(srcdir)/scintilla/src/ContractionState.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_Document.o: $(srcdir)/scintilla/src/Document.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_DocumentAccessor.o: $(srcdir)/scintilla/src/DocumentAccessor.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_Editor.o: $(srcdir)/scintilla/src/Editor.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_ExternalLexer.o: $(srcdir)/scintilla/src/ExternalLexer.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_Indicator.o: $(srcdir)/scintilla/src/Indicator.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_KeyMap.o: $(srcdir)/scintilla/src/KeyMap.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_KeyWords.o: $(srcdir)/scintilla/src/KeyWords.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexAVE.o: $(srcdir)/scintilla/src/LexAVE.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexAda.o: $(srcdir)/scintilla/src/LexAda.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexAsm.o: $(srcdir)/scintilla/src/LexAsm.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexBaan.o: $(srcdir)/scintilla/src/LexBaan.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexBullant.o: $(srcdir)/scintilla/src/LexBullant.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexCPP.o: $(srcdir)/scintilla/src/LexCPP.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexCSS.o: $(srcdir)/scintilla/src/LexCSS.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexConf.o: $(srcdir)/scintilla/src/LexConf.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexCrontab.o: $(srcdir)/scintilla/src/LexCrontab.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexEScript.o: $(srcdir)/scintilla/src/LexEScript.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexFortran.o: $(srcdir)/scintilla/src/LexFortran.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexHTML.o: $(srcdir)/scintilla/src/LexHTML.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexLisp.o: $(srcdir)/scintilla/src/LexLisp.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexLout.o: $(srcdir)/scintilla/src/LexLout.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexLua.o: $(srcdir)/scintilla/src/LexLua.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexPerl.o: $(srcdir)/scintilla/src/LexPerl.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexPython.o: $(srcdir)/scintilla/src/LexPython.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexRuby.o: $(srcdir)/scintilla/src/LexRuby.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexSQL.o: $(srcdir)/scintilla/src/LexSQL.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexVB.o: $(srcdir)/scintilla/src/LexVB.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LineMarker.o: $(srcdir)/scintilla/src/LineMarker.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_PlatWX.o: $(srcdir)/PlatWX.cpp - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_PropSet.o: $(srcdir)/scintilla/src/PropSet.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_RESearch.o: $(srcdir)/scintilla/src/RESearch.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_ScintillaBase.o: $(srcdir)/scintilla/src/ScintillaBase.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_ScintillaWX.o: $(srcdir)/ScintillaWX.cpp - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_Style.o: $(srcdir)/scintilla/src/Style.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_StyleContext.o: $(srcdir)/scintilla/src/StyleContext.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_UniConversion.o: $(srcdir)/scintilla/src/UniConversion.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_ViewStyle.o: $(srcdir)/scintilla/src/ViewStyle.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_WindowAccessor.o: $(srcdir)/scintilla/src/WindowAccessor.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_XPM.o: $(srcdir)/scintilla/src/XPM.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_stc.o: $(srcdir)/stc.cpp - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< @COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a: $(STCLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @@ -447,151 +439,151 @@ stcdll_stc.o: $(srcdir)/stc.cpp @COND_SHARED_0@ $(RANLIB) $@ stclib_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_CallTip.o: $(srcdir)/scintilla/src/CallTip.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_CellBuffer.o: $(srcdir)/scintilla/src/CellBuffer.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_ContractionState.o: $(srcdir)/scintilla/src/ContractionState.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_Document.o: $(srcdir)/scintilla/src/Document.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_DocumentAccessor.o: $(srcdir)/scintilla/src/DocumentAccessor.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_Editor.o: $(srcdir)/scintilla/src/Editor.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_ExternalLexer.o: $(srcdir)/scintilla/src/ExternalLexer.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_Indicator.o: $(srcdir)/scintilla/src/Indicator.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_KeyMap.o: $(srcdir)/scintilla/src/KeyMap.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_KeyWords.o: $(srcdir)/scintilla/src/KeyWords.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexAVE.o: $(srcdir)/scintilla/src/LexAVE.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexAda.o: $(srcdir)/scintilla/src/LexAda.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexAsm.o: $(srcdir)/scintilla/src/LexAsm.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexBaan.o: $(srcdir)/scintilla/src/LexBaan.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexBullant.o: $(srcdir)/scintilla/src/LexBullant.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexCPP.o: $(srcdir)/scintilla/src/LexCPP.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexCSS.o: $(srcdir)/scintilla/src/LexCSS.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexConf.o: $(srcdir)/scintilla/src/LexConf.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexCrontab.o: $(srcdir)/scintilla/src/LexCrontab.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexEScript.o: $(srcdir)/scintilla/src/LexEScript.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexFortran.o: $(srcdir)/scintilla/src/LexFortran.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexHTML.o: $(srcdir)/scintilla/src/LexHTML.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexLisp.o: $(srcdir)/scintilla/src/LexLisp.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexLout.o: $(srcdir)/scintilla/src/LexLout.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexLua.o: $(srcdir)/scintilla/src/LexLua.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexPerl.o: $(srcdir)/scintilla/src/LexPerl.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexPython.o: $(srcdir)/scintilla/src/LexPython.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexRuby.o: $(srcdir)/scintilla/src/LexRuby.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexSQL.o: $(srcdir)/scintilla/src/LexSQL.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexVB.o: $(srcdir)/scintilla/src/LexVB.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LineMarker.o: $(srcdir)/scintilla/src/LineMarker.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_PlatWX.o: $(srcdir)/PlatWX.cpp - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_PropSet.o: $(srcdir)/scintilla/src/PropSet.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_RESearch.o: $(srcdir)/scintilla/src/RESearch.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_ScintillaBase.o: $(srcdir)/scintilla/src/ScintillaBase.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_ScintillaWX.o: $(srcdir)/ScintillaWX.cpp - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_Style.o: $(srcdir)/scintilla/src/Style.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_StyleContext.o: $(srcdir)/scintilla/src/StyleContext.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_UniConversion.o: $(srcdir)/scintilla/src/UniConversion.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_ViewStyle.o: $(srcdir)/scintilla/src/ViewStyle.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_WindowAccessor.o: $(srcdir)/scintilla/src/WindowAccessor.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_XPM.o: $(srcdir)/scintilla/src/XPM.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_stc.o: $(srcdir)/stc.cpp - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< uninstall: diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in index 0fe16df8d6..0bfa08ef36 100644 --- a/contrib/src/svg/Makefile.in +++ b/contrib/src/svg/Makefile.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@__svgdll_PCH_DEP = .pch/wxprec_svgdll/wx/wxprec.h.gch @COND_GCC_PCH_1@__svgdll_PCH_INC = -I.pch/wxprec_svgdll COND_SHARED_1___svgdll___depname = \ - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) + $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) @COND_SHARED_1@__svgdll___depname = $(COND_SHARED_1___svgdll___depname) COND_PLATFORM_WIN32_1___svgdll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_PLATFORM_WIN32_1@__svgdll___importlib = $(COND_PLATFORM_WIN32_1___svgdll___importlib) COND_PLATFORM_MACOSX_1___svgdll___macinstnamecmd = -install_name \ - $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) + $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) @COND_PLATFORM_MACOSX_1@__svgdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___svgdll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__svgdll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ @COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) COND_USE_SOSYMLINKS_1___svgdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).$(SO_SUFFIX)) @COND_USE_SOSYMLINKS_1@__svgdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___svgdll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___svgdll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_USE_SOSYMLINKS_1@__svgdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___svgdll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___svgdll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) @COND_USE_SOVERLINUX_1@__svgdll___soname_flags = $(COND_USE_SOVERLINUX_1___svgdll___soname_flags) COND_USE_SOVERSOLARIS_1___svgdll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__svgdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___svgdll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__svgdll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @@ -171,42 +163,42 @@ all: $(__svgdll___depname) $(__svglib___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) + rm -f $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).$(SO_SUFFIX) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-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_svgdll___depname) $(__install_svglib___depname) - $(INSTALL_DIR) $(includedir) + $(INSTALL) -d $(includedir) for f in wx/svg/dcsvg.h; 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)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) + $(STRIP) $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) @COND_SHARED_1@install_svgdll: -@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL) -d $(libdir) +@COND_SHARED_1@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(libdir) +@COND_SHARED_1@ install -c $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__svgdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_svglib: -@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL) -d $(libdir) +@COND_SHARED_0@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a $(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3): $(__svgdll_PCH_DEP) $(SVGDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3): $(__svgdll_PCH_DEP) $(SVGDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(SVGDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__svgdll___macinstnamecmd) $(__svgdll___importlib) $(__svgdll___soname_flags) $(__svgdll___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@ $(__svgdll___so_symlinks_cmd) svgdll_dcsvg.o: $(srcdir)/dcsvg.cpp - $(CXXC) -c -o $@ $(SVGDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(SVGDLL_CXXFLAGS) $< @COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a: $(__svglib_PCH_DEP) $(SVGLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @@ -214,7 +206,7 @@ svgdll_dcsvg.o: $(srcdir)/dcsvg.cpp @COND_SHARED_0@ $(RANLIB) $@ svglib_dcsvg.o: $(srcdir)/dcsvg.cpp - $(CXXC) -c -o $@ $(SVGLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(SVGLIB_CXXFLAGS) $< uninstall: diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in index 11064e42ce..67bfce2c55 100644 --- a/contrib/src/xrc/Makefile.in +++ b/contrib/src/xrc/Makefile.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@ @@ -128,10 +124,6 @@ XRCLIB_OBJECTS = \ ### 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) @@ -185,42 +177,42 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_GCC_PCH_1@__xrcdll_PCH_DEP = .pch/wxprec_xrcdll/wx/wxprec.h.gch @COND_GCC_PCH_1@__xrcdll_PCH_INC = -I.pch/wxprec_xrcdll COND_SHARED_1___xrcdll___depname = \ - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) + $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) @COND_SHARED_1@__xrcdll___depname = $(COND_SHARED_1___xrcdll___depname) COND_PLATFORM_WIN32_1___xrcdll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_PLATFORM_WIN32_1@__xrcdll___importlib = $(COND_PLATFORM_WIN32_1___xrcdll___importlib) COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd = -install_name \ - $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) + $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) @COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__xrcdll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ @COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX)) @COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___xrcdll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) @COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(COND_USE_SOVERLINUX_1___xrcdll___soname_flags) COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @@ -251,152 +243,152 @@ all: $(__xrcdll___depname) $(__xrclib___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) + rm -f $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-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_xrcdll___depname) $(__install_xrclib___depname) - $(INSTALL_DIR) $(includedir) + $(INSTALL) -d $(includedir) for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; 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)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) + $(STRIP) $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) @COND_SHARED_1@install_xrcdll: -@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL) -d $(libdir) +@COND_SHARED_1@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(libdir) +@COND_SHARED_1@ install -c $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__xrcdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_xrclib: -@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL) -d $(libdir) +@COND_SHARED_0@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a $(libdir) uninstall: -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(__xrcdll_PCH_DEP) $(XRCDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(__xrcdll_PCH_DEP) $(XRCDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___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_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__xrcdll___so_symlinks_cmd) xrcdll_xh_bmp.o: $(srcdir)/xh_bmp.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_bttn.o: $(srcdir)/xh_bttn.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_cald.o: $(srcdir)/xh_cald.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_chckb.o: $(srcdir)/xh_chckb.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_chckl.o: $(srcdir)/xh_chckl.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_choic.o: $(srcdir)/xh_choic.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_combo.o: $(srcdir)/xh_combo.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_dlg.o: $(srcdir)/xh_dlg.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_frame.o: $(srcdir)/xh_frame.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_gauge.o: $(srcdir)/xh_gauge.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_html.o: $(srcdir)/xh_html.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_listb.o: $(srcdir)/xh_listb.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_listc.o: $(srcdir)/xh_listc.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_menu.o: $(srcdir)/xh_menu.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_notbk.o: $(srcdir)/xh_notbk.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_panel.o: $(srcdir)/xh_panel.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_radbt.o: $(srcdir)/xh_radbt.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_radbx.o: $(srcdir)/xh_radbx.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_scrol.o: $(srcdir)/xh_scrol.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_scwin.o: $(srcdir)/xh_scwin.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_sizer.o: $(srcdir)/xh_sizer.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_slidr.o: $(srcdir)/xh_slidr.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_spin.o: $(srcdir)/xh_spin.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_split.o: $(srcdir)/xh_split.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_stbox.o: $(srcdir)/xh_stbox.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_stlin.o: $(srcdir)/xh_stlin.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_text.o: $(srcdir)/xh_text.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_toolb.o: $(srcdir)/xh_toolb.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_tree.o: $(srcdir)/xh_tree.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xmlres.o: $(srcdir)/xmlres.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< @COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: $(__xrclib_PCH_DEP) $(XRCLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @@ -404,115 +396,115 @@ xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp @COND_SHARED_0@ $(RANLIB) $@ xrclib_xh_bmp.o: $(srcdir)/xh_bmp.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_bttn.o: $(srcdir)/xh_bttn.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_cald.o: $(srcdir)/xh_cald.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_chckb.o: $(srcdir)/xh_chckb.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_chckl.o: $(srcdir)/xh_chckl.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_choic.o: $(srcdir)/xh_choic.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_combo.o: $(srcdir)/xh_combo.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_dlg.o: $(srcdir)/xh_dlg.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_frame.o: $(srcdir)/xh_frame.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_gauge.o: $(srcdir)/xh_gauge.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_html.o: $(srcdir)/xh_html.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_listb.o: $(srcdir)/xh_listb.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_listc.o: $(srcdir)/xh_listc.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_menu.o: $(srcdir)/xh_menu.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_notbk.o: $(srcdir)/xh_notbk.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_panel.o: $(srcdir)/xh_panel.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_radbt.o: $(srcdir)/xh_radbt.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_radbx.o: $(srcdir)/xh_radbx.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_scrol.o: $(srcdir)/xh_scrol.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_scwin.o: $(srcdir)/xh_scwin.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_sizer.o: $(srcdir)/xh_sizer.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_slidr.o: $(srcdir)/xh_slidr.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_spin.o: $(srcdir)/xh_spin.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_split.o: $(srcdir)/xh_split.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_stbox.o: $(srcdir)/xh_stbox.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_stlin.o: $(srcdir)/xh_stlin.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_text.o: $(srcdir)/xh_text.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_toolb.o: $(srcdir)/xh_toolb.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_tree.o: $(srcdir)/xh_tree.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xmlres.o: $(srcdir)/xmlres.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xmlrsall.o: $(srcdir)/xmlrsall.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< # Include dependency info, if present: diff --git a/contrib/utils/wxrc/Makefile.in b/contrib/utils/wxrc/Makefile.in index 4361c44cdc..542a5259cb 100644 --- a/contrib/utils/wxrc/Makefile.in +++ b/contrib/utils/wxrc/Makefile.in @@ -13,13 +13,10 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_XML = @EXTRALIBS_XML@ HOST_SUFFIX = @HOST_SUFFIX@ -INSTALL_DIR = @INSTALL_DIR@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ LDFLAGS = @LDFLAGS@ SETFILE = @SETFILE@ STRIP = @STRIP@ @@ -41,8 +38,6 @@ WXRC_OBJECTS = \ ### Conditionally set variables: ### -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,17 +71,16 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_MONOLITHIC_0@__WXLIB_XML_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_PLATFORM_MAC_1@__wxrc___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxrc$(EXEEXT) +@COND_PLATFORM_MAC_1@__wxrc___mac_setfilecmd = $(SETFILE) -t APPL wxrc ### Targets: ### -all: wxrc$(EXEEXT) +all: wxrc clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f wxrc$(EXEEXT) + rm -f wxrc distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @@ -94,21 +88,21 @@ distclean: clean install: all install_wxrc install-strip: install - $(STRIP) $(bindir)/wxrc$(EXEEXT) + $(STRIP) $(bindir)/wxrc install_wxrc: - $(INSTALL_DIR) $(bindir) - $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(bindir) + $(INSTALL) -d $(bindir) + install -c wxrc $(bindir) uninstall: -wxrc$(EXEEXT): $(WXRC_OBJECTS) +wxrc: $(WXRC_OBJECTS) $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(EXTRALIBS_XML) $(__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) $(__wxrc___mac_setfilecmd) wxrc_wxrc.o: $(srcdir)/wxrc.cpp - $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXRC_CXXFLAGS) $< # Include dependency info, if present: diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index 293f67f1ec..e10b41d7bf 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -46,8 +45,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -77,7 +74,7 @@ WX_VERSION = 2.5.0 @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 bombs$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o bombs Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -92,22 +89,21 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__bombs___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__bombs___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C bombs$(EXEEXT) +@COND_PLATFORM_MAC_1@__bombs___mac_setfilecmd = $(SETFILE) -a C bombs @COND_PLATFORM_WIN32_1@__bombs___win32rc = bombs_bombs_rc.o @COND_PLATFORM_MACOSX_1@__bombs_bundle___depname = bombs_bundle ### Targets: ### -all: bombs$(EXEEXT) $(__bombs_bundle___depname) +all: bombs $(__bombs_bundle___depname) -bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc) +bombs: $(BOMBS_OBJECTS) $(__bombs___win32rc) $(CXX) -o $@ $(BOMBS_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) $(__bombs___mac_rezcmd) $(__bombs___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -bombs.app/Contents: bombs$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +bombs.app/Contents: bombs $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p bombs.app/Contents mkdir -p bombs.app/Contents/MacOS mkdir -p bombs.app/Contents/Resources @@ -122,17 +118,17 @@ bombs.app/Contents: bombs$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRN echo -n "APPL????" >bombs.app/Contents/PkgInfo - ln -f bombs$(EXEEXT) bombs.app/Contents/MacOS/bombs + ln -f bombs bombs.app/Contents/MacOS/bombs ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc bombs.app/Contents/Resources/bombs.rsrc ln -f $(top_srcdir)/src/mac/wxmac.icns bombs.app/Contents/Resources/wxmac.icns bombs_bombs.o: $(srcdir)/bombs.cpp - $(CXXC) -c -o $@ $(BOMBS_CXXFLAGS) $< + $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $< bombs_bombs1.o: $(srcdir)/bombs1.cpp - $(CXXC) -c -o $@ $(BOMBS_CXXFLAGS) $< + $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $< bombs_bombs_rc.o: $(srcdir)/bombs.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 @@ -140,12 +136,12 @@ bombs_bombs_rc.o: $(srcdir)/bombs.rc @COND_PLATFORM_MACOSX_1@bombs_bundle: bombs.app/Contents bombs_game.o: $(srcdir)/game.cpp - $(CXXC) -c -o $@ $(BOMBS_CXXFLAGS) $< + $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $< clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f bombs$(EXEEXT) + rm -f bombs rm -rf bombs.app distclean: clean diff --git a/demos/dbbrowse/Makefile.in b/demos/dbbrowse/Makefile.in index b96cde5b02..83a4f5128d 100644 --- a/demos/dbbrowse/Makefile.in +++ b/demos/dbbrowse/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -51,8 +50,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -82,7 +79,7 @@ WX_VERSION = 2.5.0 @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 dbbrowse$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dbbrowse Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -109,28 +106,27 @@ COND_MONOLITHIC_0___WXLIB_ODBC_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__dbbrowse___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__dbbrowse___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C dbbrowse$(EXEEXT) +@COND_PLATFORM_MAC_1@__dbbrowse___mac_setfilecmd = $(SETFILE) -a C dbbrowse @COND_PLATFORM_WIN32_1@__dbbrowse___win32rc = dbbrowse_dbbrowse_rc.o @COND_PLATFORM_MACOSX_1@__dbbrowse_bundle___depname = dbbrowse_bundle ### Targets: ### -all: dbbrowse$(EXEEXT) $(__dbbrowse_bundle___depname) +all: dbbrowse $(__dbbrowse_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f dbbrowse$(EXEEXT) + rm -f dbbrowse rm -rf dbbrowse.app -dbbrowse$(EXEEXT): $(DBBROWSE_OBJECTS) $(__dbbrowse___win32rc) +dbbrowse: $(DBBROWSE_OBJECTS) $(__dbbrowse___win32rc) $(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_DBGRID_p) $(__WXLIB_ADV_p) $(__WXLIB_ODBC_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) $(__dbbrowse___mac_rezcmd) $(__dbbrowse___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -dbbrowse.app/Contents: dbbrowse$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +dbbrowse.app/Contents: dbbrowse $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p dbbrowse.app/Contents mkdir -p dbbrowse.app/Contents/MacOS mkdir -p dbbrowse.app/Contents/Resources @@ -145,40 +141,40 @@ dbbrowse.app/Contents: dbbrowse$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >dbbrowse.app/Contents/PkgInfo - ln -f dbbrowse$(EXEEXT) dbbrowse.app/Contents/MacOS/dbbrowse + ln -f dbbrowse dbbrowse.app/Contents/MacOS/dbbrowse ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dbbrowse.app/Contents/Resources/dbbrowse.rsrc ln -f $(top_srcdir)/src/mac/wxmac.icns dbbrowse.app/Contents/Resources/wxmac.icns dbbrowse_browsedb.o: $(srcdir)/browsedb.cpp - $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $< + $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $< @COND_PLATFORM_MACOSX_1@dbbrowse_bundle: dbbrowse.app/Contents dbbrowse_dbbrowse.o: $(srcdir)/dbbrowse.cpp - $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $< + $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $< dbbrowse_dbbrowse_rc.o: $(srcdir)/dbbrowse.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 dbbrowse_dbgrid.o: $(srcdir)/dbgrid.cpp - $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $< + $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $< dbbrowse_dbtree.o: $(srcdir)/dbtree.cpp - $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $< + $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $< dbbrowse_dlguser.o: $(srcdir)/dlguser.cpp - $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $< + $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $< dbbrowse_doc.o: $(srcdir)/doc.cpp - $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $< + $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $< dbbrowse_pgmctrl.o: $(srcdir)/pgmctrl.cpp - $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $< + $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $< dbbrowse_tabpgwin.o: $(srcdir)/tabpgwin.cpp - $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $< + $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $< distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index 15216342cc..ffe8de4e27 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -51,8 +50,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -82,7 +79,7 @@ WX_VERSION = 2.5.0 @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 forty$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o forty Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -100,31 +97,30 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__forty___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__forty___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C forty$(EXEEXT) +@COND_PLATFORM_MAC_1@__forty___mac_setfilecmd = $(SETFILE) -a C forty @COND_PLATFORM_WIN32_1@__forty___win32rc = forty_forty_rc.o @COND_PLATFORM_MACOSX_1@__forty_bundle___depname = forty_bundle ### Targets: ### -all: forty$(EXEEXT) $(__forty_bundle___depname) +all: forty $(__forty_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f forty$(EXEEXT) + rm -f forty rm -rf forty.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc) +forty: $(FORTY_OBJECTS) $(__forty___win32rc) $(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__forty___mac_rezcmd) $(__forty___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -forty.app/Contents: forty$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +forty.app/Contents: forty $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p forty.app/Contents mkdir -p forty.app/Contents/MacOS mkdir -p forty.app/Contents/Resources @@ -139,7 +135,7 @@ forty.app/Contents: forty$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRN echo -n "APPL????" >forty.app/Contents/PkgInfo - ln -f forty$(EXEEXT) forty.app/Contents/MacOS/forty + ln -f forty forty.app/Contents/MacOS/forty ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc forty.app/Contents/Resources/forty.rsrc @@ -148,31 +144,31 @@ forty.app/Contents: forty$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRN @COND_PLATFORM_MACOSX_1@forty_bundle: forty.app/Contents forty_canvas.o: $(srcdir)/canvas.cpp - $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $< + $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $< forty_card.o: $(srcdir)/card.cpp - $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $< + $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $< forty_forty.o: $(srcdir)/forty.cpp - $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $< + $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $< forty_forty_rc.o: $(srcdir)/forty.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 forty_game.o: $(srcdir)/game.cpp - $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $< + $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $< forty_pile.o: $(srcdir)/pile.cpp - $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $< + $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $< forty_playerdg.o: $(srcdir)/playerdg.cpp - $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $< + $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $< forty_scoredg.o: $(srcdir)/scoredg.cpp - $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $< + $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $< forty_scorefil.o: $(srcdir)/scorefil.cpp - $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $< + $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $< install: all diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index 180f93b51d..cbc5d151f4 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 fractal$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o fractal Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,31 +87,30 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__fractal___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__fractal___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C fractal$(EXEEXT) +@COND_PLATFORM_MAC_1@__fractal___mac_setfilecmd = $(SETFILE) -a C fractal @COND_PLATFORM_WIN32_1@__fractal___win32rc = fractal_fractal_rc.o @COND_PLATFORM_MACOSX_1@__fractal_bundle___depname = fractal_bundle ### Targets: ### -all: fractal$(EXEEXT) $(__fractal_bundle___depname) +all: fractal $(__fractal_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f fractal$(EXEEXT) + rm -f fractal rm -rf fractal.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc) +fractal: $(FRACTAL_OBJECTS) $(__fractal___win32rc) $(CXX) -o $@ $(FRACTAL_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) $(__fractal___mac_rezcmd) $(__fractal___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -fractal.app/Contents: fractal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +fractal.app/Contents: fractal $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p fractal.app/Contents mkdir -p fractal.app/Contents/MacOS mkdir -p fractal.app/Contents/Resources @@ -129,7 +125,7 @@ fractal.app/Contents: fractal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >fractal.app/Contents/PkgInfo - ln -f fractal$(EXEEXT) fractal.app/Contents/MacOS/fractal + ln -f fractal fractal.app/Contents/MacOS/fractal ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fractal.app/Contents/Resources/fractal.rsrc @@ -138,7 +134,7 @@ fractal.app/Contents: fractal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@fractal_bundle: fractal.app/Contents fractal_fractal.o: $(srcdir)/fractal.cpp - $(CXXC) -c -o $@ $(FRACTAL_CXXFLAGS) $< + $(CXX) -c -o $@ $(FRACTAL_CXXFLAGS) $< fractal_fractal_rc.o: $(srcdir)/fractal.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 diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index 2ee3b25199..5f1b84858a 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -47,8 +46,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -78,7 +75,7 @@ WX_VERSION = 2.5.0 @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 life$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o life Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -93,19 +90,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__life___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__life___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C life$(EXEEXT) +@COND_PLATFORM_MAC_1@__life___mac_setfilecmd = $(SETFILE) -a C life @COND_PLATFORM_WIN32_1@__life___win32rc = life_life_rc.o @COND_PLATFORM_MACOSX_1@__life_bundle___depname = life_bundle ### Targets: ### -all: life$(EXEEXT) $(__life_bundle___depname) data +all: life $(__life_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f life$(EXEEXT) + rm -f life rm -rf life.app data: @@ -123,13 +119,13 @@ install: all install-strip: install -life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc) +life: $(LIFE_OBJECTS) $(__life___win32rc) $(CXX) -o $@ $(LIFE_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) $(__life___mac_rezcmd) $(__life___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -life.app/Contents: life$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +life.app/Contents: life $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p life.app/Contents mkdir -p life.app/Contents/MacOS mkdir -p life.app/Contents/Resources @@ -144,7 +140,7 @@ life.app/Contents: life$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM echo -n "APPL????" >life.app/Contents/PkgInfo - ln -f life$(EXEEXT) life.app/Contents/MacOS/life + ln -f life life.app/Contents/MacOS/life ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc life.app/Contents/Resources/life.rsrc @@ -153,19 +149,19 @@ life.app/Contents: life$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM @COND_PLATFORM_MACOSX_1@life_bundle: life.app/Contents life_dialogs.o: $(srcdir)/dialogs.cpp - $(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $< + $(CXX) -c -o $@ $(LIFE_CXXFLAGS) $< life_game.o: $(srcdir)/game.cpp - $(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $< + $(CXX) -c -o $@ $(LIFE_CXXFLAGS) $< life_life.o: $(srcdir)/life.cpp - $(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $< + $(CXX) -c -o $@ $(LIFE_CXXFLAGS) $< life_life_rc.o: $(srcdir)/life.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 life_reader.o: $(srcdir)/reader.cpp - $(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $< + $(CXX) -c -o $@ $(LIFE_CXXFLAGS) $< uninstall: diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index ca8b653f5d..440e702925 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 wxpoem$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o wxpoem Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -93,19 +90,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__wxpoem___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__wxpoem___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxpoem$(EXEEXT) +@COND_PLATFORM_MAC_1@__wxpoem___mac_setfilecmd = $(SETFILE) -a C wxpoem @COND_PLATFORM_WIN32_1@__wxpoem___win32rc = wxpoem_wxpoem_rc.o @COND_PLATFORM_MACOSX_1@__wxpoem_bundle___depname = wxpoem_bundle ### Targets: ### -all: wxpoem$(EXEEXT) $(__wxpoem_bundle___depname) data +all: wxpoem $(__wxpoem_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f wxpoem$(EXEEXT) + rm -f wxpoem rm -rf wxpoem.app data: @@ -125,13 +121,13 @@ install-strip: install uninstall: -wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc) +wxpoem: $(WXPOEM_OBJECTS) $(__wxpoem___win32rc) $(CXX) -o $@ $(WXPOEM_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__wxpoem___mac_rezcmd) $(__wxpoem___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -wxpoem.app/Contents: wxpoem$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +wxpoem.app/Contents: wxpoem $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p wxpoem.app/Contents mkdir -p wxpoem.app/Contents/MacOS mkdir -p wxpoem.app/Contents/Resources @@ -146,7 +142,7 @@ wxpoem.app/Contents: wxpoem$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >wxpoem.app/Contents/PkgInfo - ln -f wxpoem$(EXEEXT) wxpoem.app/Contents/MacOS/wxpoem + ln -f wxpoem wxpoem.app/Contents/MacOS/wxpoem ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc wxpoem.app/Contents/Resources/wxpoem.rsrc @@ -155,7 +151,7 @@ wxpoem.app/Contents: wxpoem$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI @COND_PLATFORM_MACOSX_1@wxpoem_bundle: wxpoem.app/Contents wxpoem_wxpoem.o: $(srcdir)/wxpoem.cpp - $(CXXC) -c -o $@ $(WXPOEM_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXPOEM_CXXFLAGS) $< wxpoem_wxpoem_rc.o: $(srcdir)/wxpoem.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 diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index 7830e41812..431469cec8 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 accesstest$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o accesstest Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -91,21 +88,21 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__accesstest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__accesstest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C accesstest$(EXEEXT) +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C accesstest @COND_PLATFORM_WIN32_1@__accesstest___win32rc = accesstest_accesstest_rc.o @COND_PLATFORM_MACOSX_1@__accesstest_bundle___depname = accesstest_bundle ### Targets: ### -all: accesstest$(EXEEXT) $(__accesstest_bundle___depname) +all: accesstest $(__accesstest_bundle___depname) -accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc) +accesstest: $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc) $(CXX) -o $@ $(ACCESSTEST_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) $(__accesstest___mac_rezcmd) $(__accesstest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -accesstest.app/Contents: accesstest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +accesstest.app/Contents: accesstest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p accesstest.app/Contents mkdir -p accesstest.app/Contents/MacOS mkdir -p accesstest.app/Contents/Resources @@ -120,14 +117,14 @@ accesstest.app/Contents: accesstest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in echo -n "APPL????" >accesstest.app/Contents/PkgInfo - ln -f accesstest$(EXEEXT) accesstest.app/Contents/MacOS/accesstest + ln -f accesstest accesstest.app/Contents/MacOS/accesstest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc accesstest.app/Contents/Resources/accesstest.rsrc ln -f $(top_srcdir)/src/mac/wxmac.icns accesstest.app/Contents/Resources/wxmac.icns accesstest_accesstest.o: $(srcdir)/accesstest.cpp - $(CXXC) -c -o $@ $(ACCESSTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(ACCESSTEST_CXXFLAGS) $< accesstest_accesstest_rc.o: $(srcdir)/accesstest.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 @@ -137,7 +134,7 @@ accesstest_accesstest_rc.o: $(srcdir)/accesstest.rc clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f accesstest$(EXEEXT) + rm -f accesstest rm -rf accesstest.app distclean: clean diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index c133190a48..367f1f3eb9 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -45,8 +44,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,7 +73,7 @@ WX_VERSION = 2.5.0 @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 arttest$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o arttest Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -91,22 +88,21 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__arttest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__arttest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C arttest$(EXEEXT) +@COND_PLATFORM_MAC_1@__arttest___mac_setfilecmd = $(SETFILE) -a C arttest @COND_PLATFORM_WIN32_1@__arttest___win32rc = arttest_arttest_rc.o @COND_PLATFORM_MACOSX_1@__arttest_bundle___depname = arttest_bundle ### Targets: ### -all: arttest$(EXEEXT) $(__arttest_bundle___depname) +all: arttest $(__arttest_bundle___depname) -arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc) +arttest: $(ARTTEST_OBJECTS) $(__arttest___win32rc) $(CXX) -o $@ $(ARTTEST_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) $(__arttest___mac_rezcmd) $(__arttest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -arttest.app/Contents: arttest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +arttest.app/Contents: arttest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p arttest.app/Contents mkdir -p arttest.app/Contents/MacOS mkdir -p arttest.app/Contents/Resources @@ -121,17 +117,17 @@ arttest.app/Contents: arttest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >arttest.app/Contents/PkgInfo - ln -f arttest$(EXEEXT) arttest.app/Contents/MacOS/arttest + ln -f arttest arttest.app/Contents/MacOS/arttest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc arttest.app/Contents/Resources/arttest.rsrc ln -f $(top_srcdir)/src/mac/wxmac.icns arttest.app/Contents/Resources/wxmac.icns arttest_artbrows.o: $(srcdir)/artbrows.cpp - $(CXXC) -c -o $@ $(ARTTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $< arttest_arttest.o: $(srcdir)/arttest.cpp - $(CXXC) -c -o $@ $(ARTTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $< arttest_arttest_rc.o: $(srcdir)/arttest.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 @@ -141,7 +137,7 @@ arttest_arttest_rc.o: $(srcdir)/arttest.rc clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f arttest$(EXEEXT) + rm -f arttest rm -rf arttest.app distclean: clean diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index 1e26775815..1704200665 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 calendar$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o calendar Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -93,22 +90,21 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__calendar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__calendar___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C calendar$(EXEEXT) +@COND_PLATFORM_MAC_1@__calendar___mac_setfilecmd = $(SETFILE) -a C calendar @COND_PLATFORM_WIN32_1@__calendar___win32rc = calendar_calendar_rc.o @COND_PLATFORM_MACOSX_1@__calendar_bundle___depname = calendar_bundle ### Targets: ### -all: calendar$(EXEEXT) $(__calendar_bundle___depname) +all: calendar $(__calendar_bundle___depname) -calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc) +calendar: $(CALENDAR_OBJECTS) $(__calendar___win32rc) $(CXX) -o $@ $(CALENDAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__calendar___mac_rezcmd) $(__calendar___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -calendar.app/Contents: calendar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +calendar.app/Contents: calendar $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p calendar.app/Contents mkdir -p calendar.app/Contents/MacOS mkdir -p calendar.app/Contents/Resources @@ -123,7 +119,7 @@ calendar.app/Contents: calendar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >calendar.app/Contents/PkgInfo - ln -f calendar$(EXEEXT) calendar.app/Contents/MacOS/calendar + ln -f calendar calendar.app/Contents/MacOS/calendar ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc calendar.app/Contents/Resources/calendar.rsrc @@ -132,7 +128,7 @@ calendar.app/Contents: calendar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@calendar_bundle: calendar.app/Contents calendar_calendar.o: $(srcdir)/calendar.cpp - $(CXXC) -c -o $@ $(CALENDAR_CXXFLAGS) $< + $(CXX) -c -o $@ $(CALENDAR_CXXFLAGS) $< calendar_calendar_rc.o: $(srcdir)/calendar.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 @@ -140,7 +136,7 @@ calendar_calendar_rc.o: $(srcdir)/calendar.rc clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f calendar$(EXEEXT) + rm -f calendar rm -rf calendar.app distclean: clean diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 355d1f69db..2b917cd3e3 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 caret$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o caret Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,22 +87,21 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__caret___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__caret___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C caret$(EXEEXT) +@COND_PLATFORM_MAC_1@__caret___mac_setfilecmd = $(SETFILE) -a C caret @COND_PLATFORM_WIN32_1@__caret___win32rc = caret_caret_rc.o @COND_PLATFORM_MACOSX_1@__caret_bundle___depname = caret_bundle ### Targets: ### -all: caret$(EXEEXT) $(__caret_bundle___depname) +all: caret $(__caret_bundle___depname) -caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc) +caret: $(CARET_OBJECTS) $(__caret___win32rc) $(CXX) -o $@ $(CARET_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) $(__caret___mac_rezcmd) $(__caret___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -caret.app/Contents: caret$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +caret.app/Contents: caret $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p caret.app/Contents mkdir -p caret.app/Contents/MacOS mkdir -p caret.app/Contents/Resources @@ -120,7 +116,7 @@ caret.app/Contents: caret$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRN echo -n "APPL????" >caret.app/Contents/PkgInfo - ln -f caret$(EXEEXT) caret.app/Contents/MacOS/caret + ln -f caret caret.app/Contents/MacOS/caret ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc caret.app/Contents/Resources/caret.rsrc @@ -129,7 +125,7 @@ caret.app/Contents: caret$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRN @COND_PLATFORM_MACOSX_1@caret_bundle: caret.app/Contents caret_caret.o: $(srcdir)/caret.cpp - $(CXXC) -c -o $@ $(CARET_CXXFLAGS) $< + $(CXX) -c -o $@ $(CARET_CXXFLAGS) $< caret_caret_rc.o: $(srcdir)/caret.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 @@ -137,7 +133,7 @@ caret_caret_rc.o: $(srcdir)/caret.rc clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f caret$(EXEEXT) + rm -f caret rm -rf caret.app distclean: clean diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in index c0945f20fa..d404a996a6 100644 --- a/samples/checklst/Makefile.in +++ b/samples/checklst/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 checklst$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o checklst Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,22 +87,21 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__checklst___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__checklst___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C checklst$(EXEEXT) +@COND_PLATFORM_MAC_1@__checklst___mac_setfilecmd = $(SETFILE) -a C checklst @COND_PLATFORM_WIN32_1@__checklst___win32rc = checklst_checklst_rc.o @COND_PLATFORM_MACOSX_1@__checklst_bundle___depname = checklst_bundle ### Targets: ### -all: checklst$(EXEEXT) $(__checklst_bundle___depname) +all: checklst $(__checklst_bundle___depname) -checklst$(EXEEXT): $(CHECKLST_OBJECTS) $(__checklst___win32rc) +checklst: $(CHECKLST_OBJECTS) $(__checklst___win32rc) $(CXX) -o $@ $(CHECKLST_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) $(__checklst___mac_rezcmd) $(__checklst___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -checklst.app/Contents: checklst$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +checklst.app/Contents: checklst $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p checklst.app/Contents mkdir -p checklst.app/Contents/MacOS mkdir -p checklst.app/Contents/Resources @@ -120,7 +116,7 @@ checklst.app/Contents: checklst$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >checklst.app/Contents/PkgInfo - ln -f checklst$(EXEEXT) checklst.app/Contents/MacOS/checklst + ln -f checklst checklst.app/Contents/MacOS/checklst ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc checklst.app/Contents/Resources/checklst.rsrc @@ -129,7 +125,7 @@ checklst.app/Contents: checklst$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@checklst_bundle: checklst.app/Contents checklst_checklst.o: $(srcdir)/checklst.cpp - $(CXXC) -c -o $@ $(CHECKLST_CXXFLAGS) $< + $(CXX) -c -o $@ $(CHECKLST_CXXFLAGS) $< checklst_checklst_rc.o: $(srcdir)/checklst.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 @@ -137,7 +133,7 @@ checklst_checklst_rc.o: $(srcdir)/checklst.rc clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f checklst$(EXEEXT) + rm -f checklst rm -rf checklst.app distclean: clean diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 9ad8fe436c..90d5414abd 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 conftest$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o conftest Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,28 +87,27 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__conftest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__conftest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C conftest$(EXEEXT) +@COND_PLATFORM_MAC_1@__conftest___mac_setfilecmd = $(SETFILE) -a C conftest @COND_PLATFORM_WIN32_1@__conftest___win32rc = conftest_conftest_rc.o @COND_PLATFORM_MACOSX_1@__conftest_bundle___depname = conftest_bundle ### Targets: ### -all: conftest$(EXEEXT) $(__conftest_bundle___depname) +all: conftest $(__conftest_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f conftest$(EXEEXT) + rm -f conftest rm -rf conftest.app -conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc) +conftest: $(CONFTEST_OBJECTS) $(__conftest___win32rc) $(CXX) -o $@ $(CONFTEST_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) $(__conftest___mac_rezcmd) $(__conftest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -conftest.app/Contents: conftest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +conftest.app/Contents: conftest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p conftest.app/Contents mkdir -p conftest.app/Contents/MacOS mkdir -p conftest.app/Contents/Resources @@ -126,7 +122,7 @@ conftest.app/Contents: conftest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >conftest.app/Contents/PkgInfo - ln -f conftest$(EXEEXT) conftest.app/Contents/MacOS/conftest + ln -f conftest conftest.app/Contents/MacOS/conftest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc conftest.app/Contents/Resources/conftest.rsrc @@ -135,7 +131,7 @@ conftest.app/Contents: conftest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@conftest_bundle: conftest.app/Contents conftest_conftest.o: $(srcdir)/conftest.cpp - $(CXXC) -c -o $@ $(CONFTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(CONFTEST_CXXFLAGS) $< conftest_conftest_rc.o: $(srcdir)/conftest.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 diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in index a9d98b6b34..52ab96f314 100644 --- a/samples/console/Makefile.in +++ b/samples/console/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ @@ -38,8 +37,6 @@ LIBDIRNAME = $(top_builddir)lib ### Conditionally set variables: ### -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -73,24 +70,24 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__console___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL console$(EXEEXT) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL console ### Targets: ### -all: console$(EXEEXT) data +all: console data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f console$(EXEEXT) + rm -f console -console$(EXEEXT): $(CONSOLE_OBJECTS) +console: $(CONSOLE_OBJECTS) $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(__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) $(__console___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) console_console.o: $(srcdir)/console.cpp - $(CXXC) -c -o $@ $(CONSOLE_CXXFLAGS) $< + $(CXX) -c -o $@ $(CONSOLE_CXXFLAGS) $< data: @mkdir -p . diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index 635faf670b..115ffef1ba 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 controls$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o controls Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,28 +87,27 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__controls___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__controls___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C controls$(EXEEXT) +@COND_PLATFORM_MAC_1@__controls___mac_setfilecmd = $(SETFILE) -a C controls @COND_PLATFORM_WIN32_1@__controls___win32rc = controls_controls_rc.o @COND_PLATFORM_MACOSX_1@__controls_bundle___depname = controls_bundle ### Targets: ### -all: controls$(EXEEXT) $(__controls_bundle___depname) +all: controls $(__controls_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f controls$(EXEEXT) + rm -f controls rm -rf controls.app -controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc) +controls: $(CONTROLS_OBJECTS) $(__controls___win32rc) $(CXX) -o $@ $(CONTROLS_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) $(__controls___mac_rezcmd) $(__controls___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -controls.app/Contents: controls$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +controls.app/Contents: controls $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p controls.app/Contents mkdir -p controls.app/Contents/MacOS mkdir -p controls.app/Contents/Resources @@ -126,7 +122,7 @@ controls.app/Contents: controls$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >controls.app/Contents/PkgInfo - ln -f controls$(EXEEXT) controls.app/Contents/MacOS/controls + ln -f controls controls.app/Contents/MacOS/controls ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc controls.app/Contents/Resources/controls.rsrc @@ -135,7 +131,7 @@ controls.app/Contents: controls$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@controls_bundle: controls.app/Contents controls_controls.o: $(srcdir)/controls.cpp - $(CXXC) -c -o $@ $(CONTROLS_CXXFLAGS) $< + $(CXX) -c -o $@ $(CONTROLS_CXXFLAGS) $< controls_controls_rc.o: $(srcdir)/controls.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 diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in index a5eef70a87..e07f4fa60e 100644 --- a/samples/db/Makefile.in +++ b/samples/db/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -45,8 +44,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,7 +73,7 @@ WX_VERSION = 2.5.0 @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 dbtest$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dbtest Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -94,28 +91,27 @@ COND_MONOLITHIC_0___WXLIB_ODBC_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__dbtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__dbtest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C dbtest$(EXEEXT) +@COND_PLATFORM_MAC_1@__dbtest___mac_setfilecmd = $(SETFILE) -a C dbtest @COND_PLATFORM_WIN32_1@__dbtest___win32rc = dbtest_dbtest_rc.o @COND_PLATFORM_MACOSX_1@__dbtest_bundle___depname = dbtest_bundle ### Targets: ### -all: dbtest$(EXEEXT) $(__dbtest_bundle___depname) +all: dbtest $(__dbtest_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f dbtest$(EXEEXT) + rm -f dbtest rm -rf dbtest.app -dbtest$(EXEEXT): $(DBTEST_OBJECTS) $(__dbtest___win32rc) +dbtest: $(DBTEST_OBJECTS) $(__dbtest___win32rc) $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ODBC_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) $(__dbtest___mac_rezcmd) $(__dbtest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -dbtest.app/Contents: dbtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +dbtest.app/Contents: dbtest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p dbtest.app/Contents mkdir -p dbtest.app/Contents/MacOS mkdir -p dbtest.app/Contents/Resources @@ -130,7 +126,7 @@ dbtest.app/Contents: dbtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >dbtest.app/Contents/PkgInfo - ln -f dbtest$(EXEEXT) dbtest.app/Contents/MacOS/dbtest + ln -f dbtest dbtest.app/Contents/MacOS/dbtest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dbtest.app/Contents/Resources/dbtest.rsrc @@ -139,13 +135,13 @@ dbtest.app/Contents: dbtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI @COND_PLATFORM_MACOSX_1@dbtest_bundle: dbtest.app/Contents dbtest_dbtest.o: $(srcdir)/dbtest.cpp - $(CXXC) -c -o $@ $(DBTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(DBTEST_CXXFLAGS) $< dbtest_dbtest_rc.o: $(srcdir)/dbtest.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 dbtest_listdb.o: $(srcdir)/listdb.cpp - $(CXXC) -c -o $@ $(DBTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(DBTEST_CXXFLAGS) $< distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index ab20299bff..98e44112a4 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 dialogs$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dialogs Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -93,19 +90,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__dialogs___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__dialogs___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C dialogs$(EXEEXT) +@COND_PLATFORM_MAC_1@__dialogs___mac_setfilecmd = $(SETFILE) -a C dialogs @COND_PLATFORM_WIN32_1@__dialogs___win32rc = dialogs_dialogs_rc.o @COND_PLATFORM_MACOSX_1@__dialogs_bundle___depname = dialogs_bundle ### Targets: ### -all: dialogs$(EXEEXT) $(__dialogs_bundle___depname) data +all: dialogs $(__dialogs_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f dialogs$(EXEEXT) + rm -f dialogs rm -rf dialogs.app data: @@ -116,13 +112,13 @@ data: fi; \ done -dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc) +dialogs: $(DIALOGS_OBJECTS) $(__dialogs___win32rc) $(CXX) -o $@ $(DIALOGS_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__dialogs___mac_rezcmd) $(__dialogs___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -dialogs.app/Contents: dialogs$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +dialogs.app/Contents: dialogs $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p dialogs.app/Contents mkdir -p dialogs.app/Contents/MacOS mkdir -p dialogs.app/Contents/Resources @@ -137,7 +133,7 @@ dialogs.app/Contents: dialogs$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >dialogs.app/Contents/PkgInfo - ln -f dialogs$(EXEEXT) dialogs.app/Contents/MacOS/dialogs + ln -f dialogs dialogs.app/Contents/MacOS/dialogs ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dialogs.app/Contents/Resources/dialogs.rsrc @@ -146,7 +142,7 @@ dialogs.app/Contents: dialogs$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@dialogs_bundle: dialogs.app/Contents dialogs_dialogs.o: $(srcdir)/dialogs.cpp - $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $< + $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $< dialogs_dialogs_rc.o: $(srcdir)/dialogs.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 diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index f6823c017b..9d78e4330e 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 nettest$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o nettest Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__nettest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__nettest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C nettest$(EXEEXT) +@COND_PLATFORM_MAC_1@__nettest___mac_setfilecmd = $(SETFILE) -a C nettest @COND_PLATFORM_WIN32_1@__nettest___win32rc = nettest_nettest_rc.o @COND_PLATFORM_MACOSX_1@__nettest_bundle___depname = nettest_bundle ### Targets: ### -all: nettest$(EXEEXT) $(__nettest_bundle___depname) +all: nettest $(__nettest_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f nettest$(EXEEXT) + rm -f nettest rm -rf nettest.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc) +nettest: $(NETTEST_OBJECTS) $(__nettest___win32rc) $(CXX) -o $@ $(NETTEST_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) $(__nettest___mac_rezcmd) $(__nettest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -nettest.app/Contents: nettest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +nettest.app/Contents: nettest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p nettest.app/Contents mkdir -p nettest.app/Contents/MacOS mkdir -p nettest.app/Contents/Resources @@ -133,7 +129,7 @@ nettest.app/Contents: nettest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >nettest.app/Contents/PkgInfo - ln -f nettest$(EXEEXT) nettest.app/Contents/MacOS/nettest + ln -f nettest nettest.app/Contents/MacOS/nettest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc nettest.app/Contents/Resources/nettest.rsrc @@ -142,7 +138,7 @@ nettest.app/Contents: nettest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@nettest_bundle: nettest.app/Contents nettest_nettest.o: $(srcdir)/nettest.cpp - $(CXXC) -c -o $@ $(NETTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(NETTEST_CXXFLAGS) $< nettest_nettest_rc.o: $(srcdir)/nettest.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 diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index 8fa82b8be9..dd5dc2d8f9 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 display$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o display Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,28 +87,27 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__display___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__display___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C display$(EXEEXT) +@COND_PLATFORM_MAC_1@__display___mac_setfilecmd = $(SETFILE) -a C display @COND_PLATFORM_WIN32_1@__display___win32rc = display_sample_rc.o @COND_PLATFORM_MACOSX_1@__display_bundle___depname = display_bundle ### Targets: ### -all: display$(EXEEXT) $(__display_bundle___depname) +all: display $(__display_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f display$(EXEEXT) + rm -f display rm -rf display.app -display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc) +display: $(DISPLAY_OBJECTS) $(__display___win32rc) $(CXX) -o $@ $(DISPLAY_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) $(__display___mac_rezcmd) $(__display___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -display.app/Contents: display$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +display.app/Contents: display $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p display.app/Contents mkdir -p display.app/Contents/MacOS mkdir -p display.app/Contents/Resources @@ -126,7 +122,7 @@ display.app/Contents: display$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >display.app/Contents/PkgInfo - ln -f display$(EXEEXT) display.app/Contents/MacOS/display + ln -f display display.app/Contents/MacOS/display ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc display.app/Contents/Resources/display.rsrc @@ -135,7 +131,7 @@ display.app/Contents: display$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@display_bundle: display.app/Contents display_display.o: $(srcdir)/display.cpp - $(CXXC) -c -o $@ $(DISPLAY_CXXFLAGS) $< + $(CXX) -c -o $@ $(DISPLAY_CXXFLAGS) $< display_sample_rc.o: $(srcdir)/../../samples/sample.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 diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index b9caeddc7a..c8b6be5dd0 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 dnd$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dnd Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,18 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__dnd___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__dnd___mac_setfilecmd = $(SETFILE) -a C dnd$(EXEEXT) +@COND_PLATFORM_MAC_1@__dnd___mac_setfilecmd = $(SETFILE) -a C dnd @COND_PLATFORM_WIN32_1@__dnd___win32rc = dnd_dnd_rc.o @COND_PLATFORM_MACOSX_1@__dnd_bundle___depname = dnd_bundle ### Targets: ### -all: dnd$(EXEEXT) $(__dnd_bundle___depname) data +all: dnd $(__dnd_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f dnd$(EXEEXT) + rm -f dnd rm -rf dnd.app data: @@ -115,13 +112,13 @@ data: distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc) +dnd: $(DND_OBJECTS) $(__dnd___win32rc) $(CXX) -o $@ $(DND_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) $(__dnd___mac_rezcmd) $(__dnd___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -dnd.app/Contents: dnd$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +dnd.app/Contents: dnd $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p dnd.app/Contents mkdir -p dnd.app/Contents/MacOS mkdir -p dnd.app/Contents/Resources @@ -136,7 +133,7 @@ dnd.app/Contents: dnd$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME) echo -n "APPL????" >dnd.app/Contents/PkgInfo - ln -f dnd$(EXEEXT) dnd.app/Contents/MacOS/dnd + ln -f dnd dnd.app/Contents/MacOS/dnd ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dnd.app/Contents/Resources/dnd.rsrc @@ -145,7 +142,7 @@ dnd.app/Contents: dnd$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME) @COND_PLATFORM_MACOSX_1@dnd_bundle: dnd.app/Contents dnd_dnd.o: $(srcdir)/dnd.cpp - $(CXXC) -c -o $@ $(DND_CXXFLAGS) $< + $(CXX) -c -o $@ $(DND_CXXFLAGS) $< dnd_dnd_rc.o: $(srcdir)/dnd.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 diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index 96ddaeccd5..a56e84ee92 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -46,8 +45,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_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r \ @COND_TOOLKIT_MAC@ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_USE_GUI_0@PORTNAME = base @@ -90,34 +87,33 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ COND_PLATFORM_MAC_1___docview___mac_rezcmd = $(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 docview$(EXEEXT) \ - $(MACOSX_RESOURCES) chart.r doc.r docview.r mondrian.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o docview $(MACOSX_RESOURCES) \ + chart.r doc.r docview.r mondrian.r @COND_PLATFORM_MAC_1@__docview___mac_rezcmd = $(COND_PLATFORM_MAC_1___docview___mac_rezcmd) -@COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C docview$(EXEEXT) +@COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = $(SETFILE) -a C docview @COND_PLATFORM_WIN32_1@__docview___win32rc = docview_docview_rc.o @COND_PLATFORM_MACOSX_1@__docview_bundle___depname = docview_bundle ### Targets: ### -all: docview$(EXEEXT) $(__docview_bundle___depname) +all: docview $(__docview_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f docview$(EXEEXT) + rm -f docview rm -rf docview.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc) +docview: $(DOCVIEW_OBJECTS) $(__docview___win32rc) $(CXX) -o $@ $(DOCVIEW_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) $(__docview___mac_rezcmd) $(__docview___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -docview.app/Contents: docview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +docview.app/Contents: docview $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p docview.app/Contents mkdir -p docview.app/Contents/MacOS mkdir -p docview.app/Contents/Resources @@ -132,7 +128,7 @@ docview.app/Contents: docview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >docview.app/Contents/PkgInfo - ln -f docview$(EXEEXT) docview.app/Contents/MacOS/docview + ln -f docview docview.app/Contents/MacOS/docview ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc docview.app/Contents/Resources/docview.rsrc @@ -141,16 +137,16 @@ docview.app/Contents: docview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@docview_bundle: docview.app/Contents docview_doc.o: $(srcdir)/doc.cpp - $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< + $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $< docview_docview.o: $(srcdir)/docview.cpp - $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< + $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $< docview_docview_rc.o: $(srcdir)/docview.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 docview_view.o: $(srcdir)/view.cpp - $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< + $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $< install: all diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in index b7565dd0f5..4bfbe5fb10 100644 --- a/samples/docvwmdi/Makefile.in +++ b/samples/docvwmdi/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -46,8 +45,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -77,7 +74,7 @@ WX_VERSION = 2.5.0 @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 docview$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o docview Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -92,31 +89,30 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__docview___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C docview$(EXEEXT) +@COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = $(SETFILE) -a C docview @COND_PLATFORM_WIN32_1@__docview___win32rc = docview_docview_rc.o @COND_PLATFORM_MACOSX_1@__docview_bundle___depname = docview_bundle ### Targets: ### -all: docview$(EXEEXT) $(__docview_bundle___depname) +all: docview $(__docview_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f docview$(EXEEXT) + rm -f docview rm -rf docview.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc) +docview: $(DOCVIEW_OBJECTS) $(__docview___win32rc) $(CXX) -o $@ $(DOCVIEW_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) $(__docview___mac_rezcmd) $(__docview___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -docview.app/Contents: docview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +docview.app/Contents: docview $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p docview.app/Contents mkdir -p docview.app/Contents/MacOS mkdir -p docview.app/Contents/Resources @@ -131,7 +127,7 @@ docview.app/Contents: docview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >docview.app/Contents/PkgInfo - ln -f docview$(EXEEXT) docview.app/Contents/MacOS/docview + ln -f docview docview.app/Contents/MacOS/docview ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc docview.app/Contents/Resources/docview.rsrc @@ -140,16 +136,16 @@ docview.app/Contents: docview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@docview_bundle: docview.app/Contents docview_doc.o: $(srcdir)/doc.cpp - $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< + $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $< docview_docview.o: $(srcdir)/docview.cpp - $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< + $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $< docview_docview_rc.o: $(srcdir)/docview.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 docview_view.o: $(srcdir)/view.cpp - $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< + $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $< install: all diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index 742de07aef..337e351bf3 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 dragimag$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dragimag Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__dragimag___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__dragimag___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C dragimag$(EXEEXT) +@COND_PLATFORM_MAC_1@__dragimag___mac_setfilecmd = $(SETFILE) -a C dragimag @COND_PLATFORM_WIN32_1@__dragimag___win32rc = dragimag_dragimag_rc.o @COND_PLATFORM_MACOSX_1@__dragimag_bundle___depname = dragimag_bundle ### Targets: ### -all: dragimag$(EXEEXT) $(__dragimag_bundle___depname) data +all: dragimag $(__dragimag_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f dragimag$(EXEEXT) + rm -f dragimag rm -rf dragimag.app data: @@ -116,13 +112,13 @@ data: distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc) +dragimag: $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc) $(CXX) -o $@ $(DRAGIMAG_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) $(__dragimag___mac_rezcmd) $(__dragimag___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -dragimag.app/Contents: dragimag$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +dragimag.app/Contents: dragimag $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p dragimag.app/Contents mkdir -p dragimag.app/Contents/MacOS mkdir -p dragimag.app/Contents/Resources @@ -137,7 +133,7 @@ dragimag.app/Contents: dragimag$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >dragimag.app/Contents/PkgInfo - ln -f dragimag$(EXEEXT) dragimag.app/Contents/MacOS/dragimag + ln -f dragimag dragimag.app/Contents/MacOS/dragimag ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dragimag.app/Contents/Resources/dragimag.rsrc @@ -146,7 +142,7 @@ dragimag.app/Contents: dragimag$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@dragimag_bundle: dragimag.app/Contents dragimag_dragimag.o: $(srcdir)/dragimag.cpp - $(CXXC) -c -o $@ $(DRAGIMAG_CXXFLAGS) $< + $(CXX) -c -o $@ $(DRAGIMAG_CXXFLAGS) $< dragimag_dragimag_rc.o: $(srcdir)/dragimag.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 diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index 07b9f10ae3..35257681a4 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 drawing$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o drawing Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__drawing___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__drawing___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C drawing$(EXEEXT) +@COND_PLATFORM_MAC_1@__drawing___mac_setfilecmd = $(SETFILE) -a C drawing @COND_PLATFORM_WIN32_1@__drawing___win32rc = drawing_drawing_rc.o @COND_PLATFORM_MACOSX_1@__drawing_bundle___depname = drawing_bundle ### Targets: ### -all: drawing$(EXEEXT) $(__drawing_bundle___depname) data +all: drawing $(__drawing_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f drawing$(EXEEXT) + rm -f drawing rm -rf drawing.app data: @@ -116,13 +112,13 @@ data: distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc) +drawing: $(DRAWING_OBJECTS) $(__drawing___win32rc) $(CXX) -o $@ $(DRAWING_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) $(__drawing___mac_rezcmd) $(__drawing___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -drawing.app/Contents: drawing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +drawing.app/Contents: drawing $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p drawing.app/Contents mkdir -p drawing.app/Contents/MacOS mkdir -p drawing.app/Contents/Resources @@ -137,7 +133,7 @@ drawing.app/Contents: drawing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >drawing.app/Contents/PkgInfo - ln -f drawing$(EXEEXT) drawing.app/Contents/MacOS/drawing + ln -f drawing drawing.app/Contents/MacOS/drawing ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc drawing.app/Contents/Resources/drawing.rsrc @@ -146,7 +142,7 @@ drawing.app/Contents: drawing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@drawing_bundle: drawing.app/Contents drawing_drawing.o: $(srcdir)/drawing.cpp - $(CXXC) -c -o $@ $(DRAWING_CXXFLAGS) $< + $(CXX) -c -o $@ $(DRAWING_CXXFLAGS) $< drawing_drawing_rc.o: $(srcdir)/drawing.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 diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in index ff554d6b5c..ac64d8045a 100644 --- a/samples/dynamic/Makefile.in +++ b/samples/dynamic/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 dynamic$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dynamic Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,31 +87,30 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__dynamic___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__dynamic___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C dynamic$(EXEEXT) +@COND_PLATFORM_MAC_1@__dynamic___mac_setfilecmd = $(SETFILE) -a C dynamic @COND_PLATFORM_WIN32_1@__dynamic___win32rc = dynamic_dynamic_rc.o @COND_PLATFORM_MACOSX_1@__dynamic_bundle___depname = dynamic_bundle ### Targets: ### -all: dynamic$(EXEEXT) $(__dynamic_bundle___depname) +all: dynamic $(__dynamic_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f dynamic$(EXEEXT) + rm -f dynamic rm -rf dynamic.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -dynamic$(EXEEXT): $(DYNAMIC_OBJECTS) $(__dynamic___win32rc) +dynamic: $(DYNAMIC_OBJECTS) $(__dynamic___win32rc) $(CXX) -o $@ $(DYNAMIC_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) $(__dynamic___mac_rezcmd) $(__dynamic___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -dynamic.app/Contents: dynamic$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +dynamic.app/Contents: dynamic $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p dynamic.app/Contents mkdir -p dynamic.app/Contents/MacOS mkdir -p dynamic.app/Contents/Resources @@ -129,7 +125,7 @@ dynamic.app/Contents: dynamic$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >dynamic.app/Contents/PkgInfo - ln -f dynamic$(EXEEXT) dynamic.app/Contents/MacOS/dynamic + ln -f dynamic dynamic.app/Contents/MacOS/dynamic ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dynamic.app/Contents/Resources/dynamic.rsrc @@ -138,7 +134,7 @@ dynamic.app/Contents: dynamic$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@dynamic_bundle: dynamic.app/Contents dynamic_dynamic.o: $(srcdir)/dynamic.cpp - $(CXXC) -c -o $@ $(DYNAMIC_CXXFLAGS) $< + $(CXX) -c -o $@ $(DYNAMIC_CXXFLAGS) $< dynamic_dynamic_rc.o: $(srcdir)/dynamic.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 diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index 3eec606456..421ff6f8eb 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 erase$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o erase Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,31 +87,30 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__erase___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__erase___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C erase$(EXEEXT) +@COND_PLATFORM_MAC_1@__erase___mac_setfilecmd = $(SETFILE) -a C erase @COND_PLATFORM_WIN32_1@__erase___win32rc = erase_erase_rc.o @COND_PLATFORM_MACOSX_1@__erase_bundle___depname = erase_bundle ### Targets: ### -all: erase$(EXEEXT) $(__erase_bundle___depname) +all: erase $(__erase_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f erase$(EXEEXT) + rm -f erase rm -rf erase.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc) +erase: $(ERASE_OBJECTS) $(__erase___win32rc) $(CXX) -o $@ $(ERASE_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) $(__erase___mac_rezcmd) $(__erase___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -erase.app/Contents: erase$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +erase.app/Contents: erase $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p erase.app/Contents mkdir -p erase.app/Contents/MacOS mkdir -p erase.app/Contents/Resources @@ -129,7 +125,7 @@ erase.app/Contents: erase$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRN echo -n "APPL????" >erase.app/Contents/PkgInfo - ln -f erase$(EXEEXT) erase.app/Contents/MacOS/erase + ln -f erase erase.app/Contents/MacOS/erase ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc erase.app/Contents/Resources/erase.rsrc @@ -138,7 +134,7 @@ erase.app/Contents: erase$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRN @COND_PLATFORM_MACOSX_1@erase_bundle: erase.app/Contents erase_erase.o: $(srcdir)/erase.cpp - $(CXXC) -c -o $@ $(ERASE_CXXFLAGS) $< + $(CXX) -c -o $@ $(ERASE_CXXFLAGS) $< erase_erase_rc.o: $(srcdir)/erase.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 diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index cdaf4e749e..5fab9db5ba 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 event$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o event Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,31 +87,30 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__event___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__event___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C event$(EXEEXT) +@COND_PLATFORM_MAC_1@__event___mac_setfilecmd = $(SETFILE) -a C event @COND_PLATFORM_WIN32_1@__event___win32rc = event_event_rc.o @COND_PLATFORM_MACOSX_1@__event_bundle___depname = event_bundle ### Targets: ### -all: event$(EXEEXT) $(__event_bundle___depname) +all: event $(__event_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f event$(EXEEXT) + rm -f event rm -rf event.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc) +event: $(EVENT_OBJECTS) $(__event___win32rc) $(CXX) -o $@ $(EVENT_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) $(__event___mac_rezcmd) $(__event___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -event.app/Contents: event$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +event.app/Contents: event $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p event.app/Contents mkdir -p event.app/Contents/MacOS mkdir -p event.app/Contents/Resources @@ -129,7 +125,7 @@ event.app/Contents: event$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRN echo -n "APPL????" >event.app/Contents/PkgInfo - ln -f event$(EXEEXT) event.app/Contents/MacOS/event + ln -f event event.app/Contents/MacOS/event ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc event.app/Contents/Resources/event.rsrc @@ -138,7 +134,7 @@ event.app/Contents: event$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRN @COND_PLATFORM_MACOSX_1@event_bundle: event.app/Contents event_event.o: $(srcdir)/event.cpp - $(CXXC) -c -o $@ $(EVENT_CXXFLAGS) $< + $(CXX) -c -o $@ $(EVENT_CXXFLAGS) $< event_event_rc.o: $(srcdir)/event.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 diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index 700c054a7b..faf0c6c139 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 exec$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o exec Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,31 +87,30 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__exec___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__exec___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C exec$(EXEEXT) +@COND_PLATFORM_MAC_1@__exec___mac_setfilecmd = $(SETFILE) -a C exec @COND_PLATFORM_WIN32_1@__exec___win32rc = exec_exec_rc.o @COND_PLATFORM_MACOSX_1@__exec_bundle___depname = exec_bundle ### Targets: ### -all: exec$(EXEEXT) $(__exec_bundle___depname) +all: exec $(__exec_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f exec$(EXEEXT) + rm -f exec rm -rf exec.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc) +exec: $(EXEC_OBJECTS) $(__exec___win32rc) $(CXX) -o $@ $(EXEC_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) $(__exec___mac_rezcmd) $(__exec___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -exec.app/Contents: exec$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +exec.app/Contents: exec $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p exec.app/Contents mkdir -p exec.app/Contents/MacOS mkdir -p exec.app/Contents/Resources @@ -129,7 +125,7 @@ exec.app/Contents: exec$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM echo -n "APPL????" >exec.app/Contents/PkgInfo - ln -f exec$(EXEEXT) exec.app/Contents/MacOS/exec + ln -f exec exec.app/Contents/MacOS/exec ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc exec.app/Contents/Resources/exec.rsrc @@ -138,7 +134,7 @@ exec.app/Contents: exec$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM @COND_PLATFORM_MACOSX_1@exec_bundle: exec.app/Contents exec_exec.o: $(srcdir)/exec.cpp - $(CXXC) -c -o $@ $(EXEC_CXXFLAGS) $< + $(CXX) -c -o $@ $(EXEC_CXXFLAGS) $< exec_exec_rc.o: $(srcdir)/exec.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 diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index 09a1ec0e8b..ae65bc4c32 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 font$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o font Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,31 +87,30 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__font___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__font___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C font$(EXEEXT) +@COND_PLATFORM_MAC_1@__font___mac_setfilecmd = $(SETFILE) -a C font @COND_PLATFORM_WIN32_1@__font___win32rc = font_font_rc.o @COND_PLATFORM_MACOSX_1@__font_bundle___depname = font_bundle ### Targets: ### -all: font$(EXEEXT) $(__font_bundle___depname) +all: font $(__font_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f font$(EXEEXT) + rm -f font rm -rf font.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc) +font: $(FONT_OBJECTS) $(__font___win32rc) $(CXX) -o $@ $(FONT_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) $(__font___mac_rezcmd) $(__font___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -font.app/Contents: font$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +font.app/Contents: font $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p font.app/Contents mkdir -p font.app/Contents/MacOS mkdir -p font.app/Contents/Resources @@ -129,7 +125,7 @@ font.app/Contents: font$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM echo -n "APPL????" >font.app/Contents/PkgInfo - ln -f font$(EXEEXT) font.app/Contents/MacOS/font + ln -f font font.app/Contents/MacOS/font ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc font.app/Contents/Resources/font.rsrc @@ -138,7 +134,7 @@ font.app/Contents: font$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM @COND_PLATFORM_MACOSX_1@font_bundle: font.app/Contents font_font.o: $(srcdir)/font.cpp - $(CXXC) -c -o $@ $(FONT_CXXFLAGS) $< + $(CXX) -c -o $@ $(FONT_CXXFLAGS) $< font_font_rc.o: $(srcdir)/font.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 diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index 7cab924981..03541790ad 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 grid$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o grid Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -93,31 +90,30 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__grid___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__grid___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C grid$(EXEEXT) +@COND_PLATFORM_MAC_1@__grid___mac_setfilecmd = $(SETFILE) -a C grid @COND_PLATFORM_WIN32_1@__grid___win32rc = grid_griddemo_rc.o @COND_PLATFORM_MACOSX_1@__grid_bundle___depname = grid_bundle ### Targets: ### -all: grid$(EXEEXT) $(__grid_bundle___depname) +all: grid $(__grid_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f grid$(EXEEXT) + rm -f grid rm -rf grid.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc) +grid: $(GRID_OBJECTS) $(__grid___win32rc) $(CXX) -o $@ $(GRID_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__grid___mac_rezcmd) $(__grid___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -grid.app/Contents: grid$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +grid.app/Contents: grid $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p grid.app/Contents mkdir -p grid.app/Contents/MacOS mkdir -p grid.app/Contents/Resources @@ -132,7 +128,7 @@ grid.app/Contents: grid$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM echo -n "APPL????" >grid.app/Contents/PkgInfo - ln -f grid$(EXEEXT) grid.app/Contents/MacOS/grid + ln -f grid grid.app/Contents/MacOS/grid ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc grid.app/Contents/Resources/grid.rsrc @@ -141,7 +137,7 @@ grid.app/Contents: grid$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM @COND_PLATFORM_MACOSX_1@grid_bundle: grid.app/Contents grid_griddemo.o: $(srcdir)/griddemo.cpp - $(CXXC) -c -o $@ $(GRID_CXXFLAGS) $< + $(CXX) -c -o $@ $(GRID_CXXFLAGS) $< grid_griddemo_rc.o: $(srcdir)/griddemo.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 diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index 77ab73eeb7..0174956468 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 help$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o help Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -93,31 +90,30 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__help___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__help___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C help$(EXEEXT) +@COND_PLATFORM_MAC_1@__help___mac_setfilecmd = $(SETFILE) -a C help @COND_PLATFORM_WIN32_1@__help___win32rc = help_demo_rc.o @COND_PLATFORM_MACOSX_1@__help_bundle___depname = help_bundle ### Targets: ### -all: help$(EXEEXT) $(__help_bundle___depname) +all: help $(__help_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f help$(EXEEXT) + rm -f help rm -rf help.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc) +help: $(HELP_OBJECTS) $(__help___win32rc) $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__help___mac_rezcmd) $(__help___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -help.app/Contents: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +help.app/Contents: help $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p help.app/Contents mkdir -p help.app/Contents/MacOS mkdir -p help.app/Contents/Resources @@ -132,7 +128,7 @@ help.app/Contents: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM echo -n "APPL????" >help.app/Contents/PkgInfo - ln -f help$(EXEEXT) help.app/Contents/MacOS/help + ln -f help help.app/Contents/MacOS/help ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc help.app/Contents/Resources/help.rsrc @@ -141,7 +137,7 @@ help.app/Contents: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM @COND_PLATFORM_MACOSX_1@help_bundle: help.app/Contents help_demo.o: $(srcdir)/demo.cpp - $(CXXC) -c -o $@ $(HELP_CXXFLAGS) $< + $(CXX) -c -o $@ $(HELP_CXXFLAGS) $< help_demo_rc.o: $(srcdir)/demo.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 diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index ea5b760b57..0972f67253 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 htlbox$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o htlbox Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -93,31 +90,30 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__htlbox___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__htlbox___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C htlbox$(EXEEXT) +@COND_PLATFORM_MAC_1@__htlbox___mac_setfilecmd = $(SETFILE) -a C htlbox @COND_PLATFORM_WIN32_1@__htlbox___win32rc = htlbox_htlbox_rc.o @COND_PLATFORM_MACOSX_1@__htlbox_bundle___depname = htlbox_bundle ### Targets: ### -all: htlbox$(EXEEXT) $(__htlbox_bundle___depname) +all: htlbox $(__htlbox_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f htlbox$(EXEEXT) + rm -f htlbox rm -rf htlbox.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc) +htlbox: $(HTLBOX_OBJECTS) $(__htlbox___win32rc) $(CXX) -o $@ $(HTLBOX_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__htlbox___mac_rezcmd) $(__htlbox___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -htlbox.app/Contents: htlbox$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +htlbox.app/Contents: htlbox $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p htlbox.app/Contents mkdir -p htlbox.app/Contents/MacOS mkdir -p htlbox.app/Contents/Resources @@ -132,7 +128,7 @@ htlbox.app/Contents: htlbox$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >htlbox.app/Contents/PkgInfo - ln -f htlbox$(EXEEXT) htlbox.app/Contents/MacOS/htlbox + ln -f htlbox htlbox.app/Contents/MacOS/htlbox ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc htlbox.app/Contents/Resources/htlbox.rsrc @@ -141,7 +137,7 @@ htlbox.app/Contents: htlbox$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI @COND_PLATFORM_MACOSX_1@htlbox_bundle: htlbox.app/Contents htlbox_htlbox.o: $(srcdir)/htlbox.cpp - $(CXXC) -c -o $@ $(HTLBOX_CXXFLAGS) $< + $(CXX) -c -o $@ $(HTLBOX_CXXFLAGS) $< htlbox_htlbox_rc.o: $(srcdir)/htlbox.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 diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index 04dddef21a..0729e97eaa 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 about$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o about Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -93,22 +90,21 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__about___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__about___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C about$(EXEEXT) +@COND_PLATFORM_MAC_1@__about___mac_setfilecmd = $(SETFILE) -a C about @COND_PLATFORM_WIN32_1@__about___win32rc = about_about_rc.o @COND_PLATFORM_MACOSX_1@__about_bundle___depname = about_bundle ### Targets: ### -all: about$(EXEEXT) $(__about_bundle___depname) data_files +all: about $(__about_bundle___depname) data_files -about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc) +about: $(ABOUT_OBJECTS) $(__about___win32rc) $(CXX) -o $@ $(ABOUT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__about___mac_rezcmd) $(__about___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -about.app/Contents: about$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +about.app/Contents: about $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p about.app/Contents mkdir -p about.app/Contents/MacOS mkdir -p about.app/Contents/Resources @@ -123,14 +119,14 @@ about.app/Contents: about$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRN echo -n "APPL????" >about.app/Contents/PkgInfo - ln -f about$(EXEEXT) about.app/Contents/MacOS/about + ln -f about about.app/Contents/MacOS/about ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc about.app/Contents/Resources/about.rsrc ln -f $(top_srcdir)/src/mac/wxmac.icns about.app/Contents/Resources/wxmac.icns about_about.o: $(srcdir)/about.cpp - $(CXXC) -c -o $@ $(ABOUT_CXXFLAGS) $< + $(CXX) -c -o $@ $(ABOUT_CXXFLAGS) $< about_about_rc.o: $(srcdir)/about.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 @@ -140,7 +136,7 @@ about_about_rc.o: $(srcdir)/about.rc clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f about$(EXEEXT) + rm -f about rm -rf about.app data_files: diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index f9a07e2818..e7cbd3c61e 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 help$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o help Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -93,19 +90,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__help___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__help___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C help$(EXEEXT) +@COND_PLATFORM_MAC_1@__help___mac_setfilecmd = $(SETFILE) -a C help @COND_PLATFORM_WIN32_1@__help___win32rc = help_help_rc.o @COND_PLATFORM_MACOSX_1@__help_bundle___depname = help_bundle ### Targets: ### -all: help$(EXEEXT) $(__help_bundle___depname) data +all: help $(__help_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f help$(EXEEXT) + rm -f help rm -rf help.app data: @@ -119,13 +115,13 @@ data: distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc) +help: $(HELP_OBJECTS) $(__help___win32rc) $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__help___mac_rezcmd) $(__help___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -help.app/Contents: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +help.app/Contents: help $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p help.app/Contents mkdir -p help.app/Contents/MacOS mkdir -p help.app/Contents/Resources @@ -140,7 +136,7 @@ help.app/Contents: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM echo -n "APPL????" >help.app/Contents/PkgInfo - ln -f help$(EXEEXT) help.app/Contents/MacOS/help + ln -f help help.app/Contents/MacOS/help ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc help.app/Contents/Resources/help.rsrc @@ -149,7 +145,7 @@ help.app/Contents: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM @COND_PLATFORM_MACOSX_1@help_bundle: help.app/Contents help_help.o: $(srcdir)/help.cpp - $(CXXC) -c -o $@ $(HELP_CXXFLAGS) $< + $(CXX) -c -o $@ $(HELP_CXXFLAGS) $< help_help_rc.o: $(srcdir)/help.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 diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index 1108eade5d..dd535644e8 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 helpview$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o helpview Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -93,19 +90,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__helpview___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__helpview___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C helpview$(EXEEXT) +@COND_PLATFORM_MAC_1@__helpview___mac_setfilecmd = $(SETFILE) -a C helpview @COND_PLATFORM_WIN32_1@__helpview___win32rc = helpview_helpview_rc.o @COND_PLATFORM_MACOSX_1@__helpview_bundle___depname = helpview_bundle ### Targets: ### -all: helpview$(EXEEXT) $(__helpview_bundle___depname) data +all: helpview $(__helpview_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f helpview$(EXEEXT) + rm -f helpview rm -rf helpview.app data: @@ -119,13 +115,13 @@ data: distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc) +helpview: $(HELPVIEW_OBJECTS) $(__helpview___win32rc) $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__helpview___mac_rezcmd) $(__helpview___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -helpview.app/Contents: helpview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +helpview.app/Contents: helpview $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p helpview.app/Contents mkdir -p helpview.app/Contents/MacOS mkdir -p helpview.app/Contents/Resources @@ -140,7 +136,7 @@ helpview.app/Contents: helpview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >helpview.app/Contents/PkgInfo - ln -f helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview + ln -f helpview helpview.app/Contents/MacOS/helpview ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc helpview.app/Contents/Resources/helpview.rsrc @@ -149,7 +145,7 @@ helpview.app/Contents: helpview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@helpview_bundle: helpview.app/Contents helpview_helpview.o: $(srcdir)/helpview.cpp - $(CXXC) -c -o $@ $(HELPVIEW_CXXFLAGS) $< + $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $< helpview_helpview_rc.o: $(srcdir)/helpview.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 diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index 552c5ac1fc..8fb11e5162 100644 --- a/samples/html/printing/Makefile.in +++ b/samples/html/printing/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 printing$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o printing Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -93,19 +90,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__printing___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C printing$(EXEEXT) +@COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = $(SETFILE) -a C printing @COND_PLATFORM_WIN32_1@__printing___win32rc = printing_printing_rc.o @COND_PLATFORM_MACOSX_1@__printing_bundle___depname = printing_bundle ### Targets: ### -all: printing$(EXEEXT) $(__printing_bundle___depname) data +all: printing $(__printing_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f printing$(EXEEXT) + rm -f printing rm -rf printing.app data: @@ -123,13 +119,13 @@ install: all install-strip: install -printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc) +printing: $(PRINTING_OBJECTS) $(__printing___win32rc) $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__printing___mac_rezcmd) $(__printing___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -printing.app/Contents: printing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +printing.app/Contents: printing $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p printing.app/Contents mkdir -p printing.app/Contents/MacOS mkdir -p printing.app/Contents/Resources @@ -144,7 +140,7 @@ printing.app/Contents: printing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >printing.app/Contents/PkgInfo - ln -f printing$(EXEEXT) printing.app/Contents/MacOS/printing + ln -f printing printing.app/Contents/MacOS/printing ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc printing.app/Contents/Resources/printing.rsrc @@ -153,7 +149,7 @@ printing.app/Contents: printing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@printing_bundle: printing.app/Contents printing_printing.o: $(srcdir)/printing.cpp - $(CXXC) -c -o $@ $(PRINTING_CXXFLAGS) $< + $(CXX) -c -o $@ $(PRINTING_CXXFLAGS) $< printing_printing_rc.o: $(srcdir)/printing.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 diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index 3b605c5761..66414e50dc 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 test$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o test Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -95,19 +92,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__test___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C test$(EXEEXT) +@COND_PLATFORM_MAC_1@__test___mac_setfilecmd = $(SETFILE) -a C test @COND_PLATFORM_WIN32_1@__test___win32rc = test_test_rc.o @COND_PLATFORM_MACOSX_1@__test_bundle___depname = test_bundle ### Targets: ### -all: test$(EXEEXT) $(__test_bundle___depname) data +all: test $(__test_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f test$(EXEEXT) + rm -f test rm -rf test.app data: @@ -125,13 +121,13 @@ install: all install-strip: install -test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) +test: $(TEST_OBJECTS) $(__test___win32rc) $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__test___mac_rezcmd) $(__test___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -test.app/Contents: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +test.app/Contents: test $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p test.app/Contents mkdir -p test.app/Contents/MacOS mkdir -p test.app/Contents/Resources @@ -146,7 +142,7 @@ test.app/Contents: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM echo -n "APPL????" >test.app/Contents/PkgInfo - ln -f test$(EXEEXT) test.app/Contents/MacOS/test + ln -f test test.app/Contents/MacOS/test ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc test.app/Contents/Resources/test.rsrc @@ -155,7 +151,7 @@ test.app/Contents: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM @COND_PLATFORM_MACOSX_1@test_bundle: test.app/Contents test_test.o: $(srcdir)/test.cpp - $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEST_CXXFLAGS) $< test_test_rc.o: $(srcdir)/test.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 diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index 45c6bdc562..b153e51578 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 virtual$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o virtual Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -93,19 +90,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__virtual___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__virtual___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C virtual$(EXEEXT) +@COND_PLATFORM_MAC_1@__virtual___mac_setfilecmd = $(SETFILE) -a C virtual @COND_PLATFORM_WIN32_1@__virtual___win32rc = virtual_virtual_rc.o @COND_PLATFORM_MACOSX_1@__virtual_bundle___depname = virtual_bundle ### Targets: ### -all: virtual$(EXEEXT) $(__virtual_bundle___depname) data +all: virtual $(__virtual_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f virtual$(EXEEXT) + rm -f virtual rm -rf virtual.app data: @@ -125,13 +121,13 @@ install-strip: install uninstall: -virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc) +virtual: $(VIRTUAL_OBJECTS) $(__virtual___win32rc) $(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__virtual___mac_rezcmd) $(__virtual___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -virtual.app/Contents: virtual$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +virtual.app/Contents: virtual $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p virtual.app/Contents mkdir -p virtual.app/Contents/MacOS mkdir -p virtual.app/Contents/Resources @@ -146,7 +142,7 @@ virtual.app/Contents: virtual$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >virtual.app/Contents/PkgInfo - ln -f virtual$(EXEEXT) virtual.app/Contents/MacOS/virtual + ln -f virtual virtual.app/Contents/MacOS/virtual ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc virtual.app/Contents/Resources/virtual.rsrc @@ -155,7 +151,7 @@ virtual.app/Contents: virtual$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@virtual_bundle: virtual.app/Contents virtual_virtual.o: $(srcdir)/virtual.cpp - $(CXXC) -c -o $@ $(VIRTUAL_CXXFLAGS) $< + $(CXX) -c -o $@ $(VIRTUAL_CXXFLAGS) $< virtual_virtual_rc.o: $(srcdir)/virtual.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 diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index edb6c41766..b0eb15ff24 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 widget$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o widget Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -93,19 +90,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__widget___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__widget___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C widget$(EXEEXT) +@COND_PLATFORM_MAC_1@__widget___mac_setfilecmd = $(SETFILE) -a C widget @COND_PLATFORM_WIN32_1@__widget___win32rc = widget_widget_rc.o @COND_PLATFORM_MACOSX_1@__widget_bundle___depname = widget_bundle ### Targets: ### -all: widget$(EXEEXT) $(__widget_bundle___depname) data +all: widget $(__widget_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f widget$(EXEEXT) + rm -f widget rm -rf widget.app data: @@ -125,13 +121,13 @@ install-strip: install uninstall: -widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc) +widget: $(WIDGET_OBJECTS) $(__widget___win32rc) $(CXX) -o $@ $(WIDGET_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__widget___mac_rezcmd) $(__widget___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -widget.app/Contents: widget$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +widget.app/Contents: widget $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p widget.app/Contents mkdir -p widget.app/Contents/MacOS mkdir -p widget.app/Contents/Resources @@ -146,7 +142,7 @@ widget.app/Contents: widget$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >widget.app/Contents/PkgInfo - ln -f widget$(EXEEXT) widget.app/Contents/MacOS/widget + ln -f widget widget.app/Contents/MacOS/widget ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc widget.app/Contents/Resources/widget.rsrc @@ -155,7 +151,7 @@ widget.app/Contents: widget$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI @COND_PLATFORM_MACOSX_1@widget_bundle: widget.app/Contents widget_widget.o: $(srcdir)/widget.cpp - $(CXXC) -c -o $@ $(WIDGET_CXXFLAGS) $< + $(CXX) -c -o $@ $(WIDGET_CXXFLAGS) $< widget_widget_rc.o: $(srcdir)/widget.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 diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index fb72faa578..ad37424df5 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,6 @@ ZIP_OBJECTS = \ ### Conditionally set variables: ### -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ ZIP_OBJECTS = \ @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 zip$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o zip Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -93,18 +90,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__zip___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__zip___mac_setfilecmd = $(SETFILE) -a C zip$(EXEEXT) +@COND_PLATFORM_MAC_1@__zip___mac_setfilecmd = $(SETFILE) -a C zip @COND_PLATFORM_WIN32_1@__zip___win32rc = zip_zip_rc.o @COND_PLATFORM_MACOSX_1@__zip_bundle___depname = zip_bundle ### Targets: ### -all: zip$(EXEEXT) $(__zip_bundle___depname) data +all: zip $(__zip_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f zip$(EXEEXT) + rm -f zip rm -rf zip.app data: @@ -124,13 +121,13 @@ install-strip: install uninstall: -zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc) +zip: $(ZIP_OBJECTS) $(__zip___win32rc) $(CXX) -o $@ $(ZIP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__zip___mac_rezcmd) $(__zip___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -zip.app/Contents: zip$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +zip.app/Contents: zip $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p zip.app/Contents mkdir -p zip.app/Contents/MacOS mkdir -p zip.app/Contents/Resources @@ -145,7 +142,7 @@ zip.app/Contents: zip$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME) echo -n "APPL????" >zip.app/Contents/PkgInfo - ln -f zip$(EXEEXT) zip.app/Contents/MacOS/zip + ln -f zip zip.app/Contents/MacOS/zip ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc zip.app/Contents/Resources/zip.rsrc @@ -154,7 +151,7 @@ zip.app/Contents: zip$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME) @COND_PLATFORM_MACOSX_1@zip_bundle: zip.app/Contents zip_zip.o: $(srcdir)/zip.cpp - $(CXXC) -c -o $@ $(ZIP_CXXFLAGS) $< + $(CXX) -c -o $@ $(ZIP_CXXFLAGS) $< zip_zip_rc.o: $(srcdir)/zip.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 diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index 2331958cb3..c92857bd03 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 image$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o image Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__image___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__image___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C image$(EXEEXT) +@COND_PLATFORM_MAC_1@__image___mac_setfilecmd = $(SETFILE) -a C image @COND_PLATFORM_WIN32_1@__image___win32rc = image_image_rc.o @COND_PLATFORM_MACOSX_1@__image_bundle___depname = image_bundle ### Targets: ### -all: image$(EXEEXT) $(__image_bundle___depname) data +all: image $(__image_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f image$(EXEEXT) + rm -f image rm -rf image.app data: @@ -116,13 +112,13 @@ data: distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc) +image: $(IMAGE_OBJECTS) $(__image___win32rc) $(CXX) -o $@ $(IMAGE_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) $(__image___mac_rezcmd) $(__image___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -image.app/Contents: image$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +image.app/Contents: image $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p image.app/Contents mkdir -p image.app/Contents/MacOS mkdir -p image.app/Contents/Resources @@ -137,7 +133,7 @@ image.app/Contents: image$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRN echo -n "APPL????" >image.app/Contents/PkgInfo - ln -f image$(EXEEXT) image.app/Contents/MacOS/image + ln -f image image.app/Contents/MacOS/image ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc image.app/Contents/Resources/image.rsrc @@ -146,7 +142,7 @@ image.app/Contents: image$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRN @COND_PLATFORM_MACOSX_1@image_bundle: image.app/Contents image_image.o: $(srcdir)/image.cpp - $(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $< + $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $< image_image_rc.o: $(srcdir)/image.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 diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index 996327853f..5b06ef393f 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 internat$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o internat Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__internat___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__internat___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C internat$(EXEEXT) +@COND_PLATFORM_MAC_1@__internat___mac_setfilecmd = $(SETFILE) -a C internat @COND_PLATFORM_WIN32_1@__internat___win32rc = internat_internat_rc.o @COND_PLATFORM_MACOSX_1@__internat_bundle___depname = internat_bundle ### Targets: ### -all: internat$(EXEEXT) $(__internat_bundle___depname) +all: internat $(__internat_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f internat$(EXEEXT) + rm -f internat rm -rf internat.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc) +internat: $(INTERNAT_OBJECTS) $(__internat___win32rc) $(CXX) -o $@ $(INTERNAT_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) $(__internat___mac_rezcmd) $(__internat___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -internat.app/Contents: internat$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +internat.app/Contents: internat $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p internat.app/Contents mkdir -p internat.app/Contents/MacOS mkdir -p internat.app/Contents/Resources @@ -133,7 +129,7 @@ internat.app/Contents: internat$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >internat.app/Contents/PkgInfo - ln -f internat$(EXEEXT) internat.app/Contents/MacOS/internat + ln -f internat internat.app/Contents/MacOS/internat ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc internat.app/Contents/Resources/internat.rsrc @@ -142,7 +138,7 @@ internat.app/Contents: internat$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@internat_bundle: internat.app/Contents internat_internat.o: $(srcdir)/internat.cpp - $(CXXC) -c -o $@ $(INTERNAT_CXXFLAGS) $< + $(CXX) -c -o $@ $(INTERNAT_CXXFLAGS) $< internat_internat_rc.o: $(srcdir)/internat.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 diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index 04ed4b298d..f08ca85526 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -50,8 +49,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -81,12 +78,12 @@ WX_VERSION = 2.5.0 @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o client$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o client Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o server$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o server Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -103,35 +100,33 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_6 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__client___mac_rezcmd = $(__MACOSX_RESOURCES_p_2) -@COND_PLATFORM_MAC_1@__client___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C client$(EXEEXT) +@COND_PLATFORM_MAC_1@__client___mac_setfilecmd = $(SETFILE) -a C client @COND_PLATFORM_WIN32_1@__client___win32rc = client_sample_rc.o @COND_PLATFORM_MACOSX_1@__client_bundle___depname = client_bundle @COND_PLATFORM_MAC_1@__server___mac_rezcmd = $(__MACOSX_RESOURCES_p_3) -@COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C server$(EXEEXT) +@COND_PLATFORM_MAC_1@__server___mac_setfilecmd = $(SETFILE) -a C server @COND_PLATFORM_WIN32_1@__server___win32rc = server_sample_rc.o @COND_PLATFORM_MACOSX_1@__server_bundle___depname = server_bundle ### Targets: ### -all: client$(EXEEXT) $(__client_bundle___depname) server$(EXEEXT) $(__server_bundle___depname) +all: client $(__client_bundle___depname) server $(__server_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f client$(EXEEXT) + rm -f client rm -rf client.app - rm -f server$(EXEEXT) + rm -f server rm -rf server.app -client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc) +client: $(CLIENT_OBJECTS) $(__client___win32rc) $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__client___mac_rezcmd) $(__client___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -client.app/Contents: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +client.app/Contents: client $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p client.app/Contents mkdir -p client.app/Contents/MacOS mkdir -p client.app/Contents/Resources @@ -146,7 +141,7 @@ client.app/Contents: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >client.app/Contents/PkgInfo - ln -f client$(EXEEXT) client.app/Contents/MacOS/client + ln -f client client.app/Contents/MacOS/client ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc client.app/Contents/Resources/client.rsrc @@ -155,7 +150,7 @@ client.app/Contents: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI @COND_PLATFORM_MACOSX_1@client_bundle: client.app/Contents client_client.o: $(srcdir)/client.cpp - $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $< + $(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $< client_sample_rc.o: $(srcdir)/../../samples/sample.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples @@ -167,13 +162,13 @@ install: all install-strip: install -server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc) +server: $(SERVER_OBJECTS) $(__server___win32rc) $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__server___mac_rezcmd) $(__server___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -server.app/Contents: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +server.app/Contents: server $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p server.app/Contents mkdir -p server.app/Contents/MacOS mkdir -p server.app/Contents/Resources @@ -188,7 +183,7 @@ server.app/Contents: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >server.app/Contents/PkgInfo - ln -f server$(EXEEXT) server.app/Contents/MacOS/server + ln -f server server.app/Contents/MacOS/server ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc server.app/Contents/Resources/server.rsrc @@ -200,7 +195,7 @@ server_sample_rc.o: $(srcdir)/../../samples/sample.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples server_server.o: $(srcdir)/server.cpp - $(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $< + $(CXX) -c -o $@ $(SERVER_CXXFLAGS) $< uninstall: diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index 1c35c47b70..0e1ed993dc 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 joytest$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o joytest Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -93,19 +90,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__joytest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__joytest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C joytest$(EXEEXT) +@COND_PLATFORM_MAC_1@__joytest___mac_setfilecmd = $(SETFILE) -a C joytest @COND_PLATFORM_WIN32_1@__joytest___win32rc = joytest_joytest_rc.o @COND_PLATFORM_MACOSX_1@__joytest_bundle___depname = joytest_bundle ### Targets: ### -all: joytest$(EXEEXT) $(__joytest_bundle___depname) +all: joytest $(__joytest_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f joytest$(EXEEXT) + rm -f joytest rm -rf joytest.app distclean: clean @@ -115,13 +111,13 @@ install: all install-strip: install -joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc) +joytest: $(JOYTEST_OBJECTS) $(__joytest___win32rc) $(CXX) -o $@ $(JOYTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__joytest___mac_rezcmd) $(__joytest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -joytest.app/Contents: joytest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +joytest.app/Contents: joytest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p joytest.app/Contents mkdir -p joytest.app/Contents/MacOS mkdir -p joytest.app/Contents/Resources @@ -136,7 +132,7 @@ joytest.app/Contents: joytest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >joytest.app/Contents/PkgInfo - ln -f joytest$(EXEEXT) joytest.app/Contents/MacOS/joytest + ln -f joytest joytest.app/Contents/MacOS/joytest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc joytest.app/Contents/Resources/joytest.rsrc @@ -145,7 +141,7 @@ joytest.app/Contents: joytest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@joytest_bundle: joytest.app/Contents joytest_joytest.o: $(srcdir)/joytest.cpp - $(CXXC) -c -o $@ $(JOYTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(JOYTEST_CXXFLAGS) $< joytest_joytest_rc.o: $(srcdir)/joytest.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 diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index 29ca706225..67d53ff479 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 keyboard$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o keyboard Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__keyboard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__keyboard___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C keyboard$(EXEEXT) +@COND_PLATFORM_MAC_1@__keyboard___mac_setfilecmd = $(SETFILE) -a C keyboard @COND_PLATFORM_WIN32_1@__keyboard___win32rc = keyboard_keyboard_rc.o @COND_PLATFORM_MACOSX_1@__keyboard_bundle___depname = keyboard_bundle ### Targets: ### -all: keyboard$(EXEEXT) $(__keyboard_bundle___depname) +all: keyboard $(__keyboard_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f keyboard$(EXEEXT) + rm -f keyboard rm -rf keyboard.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc) +keyboard: $(KEYBOARD_OBJECTS) $(__keyboard___win32rc) $(CXX) -o $@ $(KEYBOARD_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) $(__keyboard___mac_rezcmd) $(__keyboard___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -keyboard.app/Contents: keyboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +keyboard.app/Contents: keyboard $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p keyboard.app/Contents mkdir -p keyboard.app/Contents/MacOS mkdir -p keyboard.app/Contents/Resources @@ -133,7 +129,7 @@ keyboard.app/Contents: keyboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >keyboard.app/Contents/PkgInfo - ln -f keyboard$(EXEEXT) keyboard.app/Contents/MacOS/keyboard + ln -f keyboard keyboard.app/Contents/MacOS/keyboard ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc keyboard.app/Contents/Resources/keyboard.rsrc @@ -142,7 +138,7 @@ keyboard.app/Contents: keyboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@keyboard_bundle: keyboard.app/Contents keyboard_keyboard.o: $(srcdir)/keyboard.cpp - $(CXXC) -c -o $@ $(KEYBOARD_CXXFLAGS) $< + $(CXX) -c -o $@ $(KEYBOARD_CXXFLAGS) $< keyboard_keyboard_rc.o: $(srcdir)/keyboard.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 diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index 2205d4cba0..5068efb814 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 layout$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o layout Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__layout___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__layout___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C layout$(EXEEXT) +@COND_PLATFORM_MAC_1@__layout___mac_setfilecmd = $(SETFILE) -a C layout @COND_PLATFORM_WIN32_1@__layout___win32rc = layout_layout_rc.o @COND_PLATFORM_MACOSX_1@__layout_bundle___depname = layout_bundle ### Targets: ### -all: layout$(EXEEXT) $(__layout_bundle___depname) +all: layout $(__layout_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f layout$(EXEEXT) + rm -f layout rm -rf layout.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc) +layout: $(LAYOUT_OBJECTS) $(__layout___win32rc) $(CXX) -o $@ $(LAYOUT_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) $(__layout___mac_rezcmd) $(__layout___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -layout.app/Contents: layout$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +layout.app/Contents: layout $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p layout.app/Contents mkdir -p layout.app/Contents/MacOS mkdir -p layout.app/Contents/Resources @@ -133,7 +129,7 @@ layout.app/Contents: layout$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >layout.app/Contents/PkgInfo - ln -f layout$(EXEEXT) layout.app/Contents/MacOS/layout + ln -f layout layout.app/Contents/MacOS/layout ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc layout.app/Contents/Resources/layout.rsrc @@ -142,7 +138,7 @@ layout.app/Contents: layout$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI @COND_PLATFORM_MACOSX_1@layout_bundle: layout.app/Contents layout_layout.o: $(srcdir)/layout.cpp - $(CXXC) -c -o $@ $(LAYOUT_CXXFLAGS) $< + $(CXX) -c -o $@ $(LAYOUT_CXXFLAGS) $< layout_layout_rc.o: $(srcdir)/layout.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 diff --git a/samples/listbox/Makefile.in b/samples/listbox/Makefile.in index a1d6ef6a38..c0a358ad6f 100644 --- a/samples/listbox/Makefile.in +++ b/samples/listbox/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 listbox$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o listbox Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__listbox___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__listbox___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C listbox$(EXEEXT) +@COND_PLATFORM_MAC_1@__listbox___mac_setfilecmd = $(SETFILE) -a C listbox @COND_PLATFORM_WIN32_1@__listbox___win32rc = listbox_sample_rc.o @COND_PLATFORM_MACOSX_1@__listbox_bundle___depname = listbox_bundle ### Targets: ### -all: listbox$(EXEEXT) $(__listbox_bundle___depname) +all: listbox $(__listbox_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f listbox$(EXEEXT) + rm -f listbox rm -rf listbox.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -listbox$(EXEEXT): $(LISTBOX_OBJECTS) $(__listbox___win32rc) +listbox: $(LISTBOX_OBJECTS) $(__listbox___win32rc) $(CXX) -o $@ $(LISTBOX_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) $(__listbox___mac_rezcmd) $(__listbox___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -listbox.app/Contents: listbox$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +listbox.app/Contents: listbox $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p listbox.app/Contents mkdir -p listbox.app/Contents/MacOS mkdir -p listbox.app/Contents/Resources @@ -133,7 +129,7 @@ listbox.app/Contents: listbox$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >listbox.app/Contents/PkgInfo - ln -f listbox$(EXEEXT) listbox.app/Contents/MacOS/listbox + ln -f listbox listbox.app/Contents/MacOS/listbox ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc listbox.app/Contents/Resources/listbox.rsrc @@ -142,7 +138,7 @@ listbox.app/Contents: listbox$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@listbox_bundle: listbox.app/Contents listbox_lboxtest.o: $(srcdir)/lboxtest.cpp - $(CXXC) -c -o $@ $(LISTBOX_CXXFLAGS) $< + $(CXX) -c -o $@ $(LISTBOX_CXXFLAGS) $< listbox_sample_rc.o: $(srcdir)/../../samples/sample.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 diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index ba3d0d8acf..61d80f13e0 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 listctrl$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o listctrl Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__listctrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__listctrl___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C listctrl$(EXEEXT) +@COND_PLATFORM_MAC_1@__listctrl___mac_setfilecmd = $(SETFILE) -a C listctrl @COND_PLATFORM_WIN32_1@__listctrl___win32rc = listctrl_listtest_rc.o @COND_PLATFORM_MACOSX_1@__listctrl_bundle___depname = listctrl_bundle ### Targets: ### -all: listctrl$(EXEEXT) $(__listctrl_bundle___depname) +all: listctrl $(__listctrl_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f listctrl$(EXEEXT) + rm -f listctrl rm -rf listctrl.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc) +listctrl: $(LISTCTRL_OBJECTS) $(__listctrl___win32rc) $(CXX) -o $@ $(LISTCTRL_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) $(__listctrl___mac_rezcmd) $(__listctrl___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -listctrl.app/Contents: listctrl$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +listctrl.app/Contents: listctrl $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p listctrl.app/Contents mkdir -p listctrl.app/Contents/MacOS mkdir -p listctrl.app/Contents/Resources @@ -133,7 +129,7 @@ listctrl.app/Contents: listctrl$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >listctrl.app/Contents/PkgInfo - ln -f listctrl$(EXEEXT) listctrl.app/Contents/MacOS/listctrl + ln -f listctrl listctrl.app/Contents/MacOS/listctrl ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc listctrl.app/Contents/Resources/listctrl.rsrc @@ -142,7 +138,7 @@ listctrl.app/Contents: listctrl$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@listctrl_bundle: listctrl.app/Contents listctrl_listtest.o: $(srcdir)/listtest.cpp - $(CXXC) -c -o $@ $(LISTCTRL_CXXFLAGS) $< + $(CXX) -c -o $@ $(LISTCTRL_CXXFLAGS) $< listctrl_listtest_rc.o: $(srcdir)/listtest.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 diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index 9adb6a61af..3a28b590c7 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 mdi$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o mdi Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,18 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__mdi___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__mdi___mac_setfilecmd = $(SETFILE) -a C mdi$(EXEEXT) +@COND_PLATFORM_MAC_1@__mdi___mac_setfilecmd = $(SETFILE) -a C mdi @COND_PLATFORM_WIN32_1@__mdi___win32rc = mdi_mdi_rc.o @COND_PLATFORM_MACOSX_1@__mdi_bundle___depname = mdi_bundle ### Targets: ### -all: mdi$(EXEEXT) $(__mdi_bundle___depname) +all: mdi $(__mdi_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f mdi$(EXEEXT) + rm -f mdi rm -rf mdi.app distclean: clean @@ -111,13 +108,13 @@ install: all install-strip: install -mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc) +mdi: $(MDI_OBJECTS) $(__mdi___win32rc) $(CXX) -o $@ $(MDI_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) $(__mdi___mac_rezcmd) $(__mdi___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -mdi.app/Contents: mdi$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +mdi.app/Contents: mdi $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p mdi.app/Contents mkdir -p mdi.app/Contents/MacOS mkdir -p mdi.app/Contents/Resources @@ -132,7 +129,7 @@ mdi.app/Contents: mdi$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME) echo -n "APPL????" >mdi.app/Contents/PkgInfo - ln -f mdi$(EXEEXT) mdi.app/Contents/MacOS/mdi + ln -f mdi mdi.app/Contents/MacOS/mdi ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mdi.app/Contents/Resources/mdi.rsrc @@ -141,7 +138,7 @@ mdi.app/Contents: mdi$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME) @COND_PLATFORM_MACOSX_1@mdi_bundle: mdi.app/Contents mdi_mdi.o: $(srcdir)/mdi.cpp - $(CXXC) -c -o $@ $(MDI_CXXFLAGS) $< + $(CXX) -c -o $@ $(MDI_CXXFLAGS) $< mdi_mdi_rc.o: $(srcdir)/mdi.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 diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index 4d3d23d02e..31ccb61467 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 memcheck$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o memcheck Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__memcheck___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__memcheck___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C memcheck$(EXEEXT) +@COND_PLATFORM_MAC_1@__memcheck___mac_setfilecmd = $(SETFILE) -a C memcheck @COND_PLATFORM_WIN32_1@__memcheck___win32rc = memcheck_memcheck_rc.o @COND_PLATFORM_MACOSX_1@__memcheck_bundle___depname = memcheck_bundle ### Targets: ### -all: memcheck$(EXEEXT) $(__memcheck_bundle___depname) +all: memcheck $(__memcheck_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f memcheck$(EXEEXT) + rm -f memcheck rm -rf memcheck.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc) +memcheck: $(MEMCHECK_OBJECTS) $(__memcheck___win32rc) $(CXX) -o $@ $(MEMCHECK_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) $(__memcheck___mac_rezcmd) $(__memcheck___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -memcheck.app/Contents: memcheck$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +memcheck.app/Contents: memcheck $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p memcheck.app/Contents mkdir -p memcheck.app/Contents/MacOS mkdir -p memcheck.app/Contents/Resources @@ -133,7 +129,7 @@ memcheck.app/Contents: memcheck$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >memcheck.app/Contents/PkgInfo - ln -f memcheck$(EXEEXT) memcheck.app/Contents/MacOS/memcheck + ln -f memcheck memcheck.app/Contents/MacOS/memcheck ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc memcheck.app/Contents/Resources/memcheck.rsrc @@ -142,7 +138,7 @@ memcheck.app/Contents: memcheck$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@memcheck_bundle: memcheck.app/Contents memcheck_memcheck.o: $(srcdir)/memcheck.cpp - $(CXXC) -c -o $@ $(MEMCHECK_CXXFLAGS) $< + $(CXX) -c -o $@ $(MEMCHECK_CXXFLAGS) $< memcheck_memcheck_rc.o: $(srcdir)/memcheck.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 diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index 7e9c694acd..84ebced700 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 menu$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o menu Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__menu___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__menu___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C menu$(EXEEXT) +@COND_PLATFORM_MAC_1@__menu___mac_setfilecmd = $(SETFILE) -a C menu @COND_PLATFORM_WIN32_1@__menu___win32rc = menu_menu_rc.o @COND_PLATFORM_MACOSX_1@__menu_bundle___depname = menu_bundle ### Targets: ### -all: menu$(EXEEXT) $(__menu_bundle___depname) +all: menu $(__menu_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f menu$(EXEEXT) + rm -f menu rm -rf menu.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc) +menu: $(MENU_OBJECTS) $(__menu___win32rc) $(CXX) -o $@ $(MENU_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) $(__menu___mac_rezcmd) $(__menu___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -menu.app/Contents: menu$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +menu.app/Contents: menu $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p menu.app/Contents mkdir -p menu.app/Contents/MacOS mkdir -p menu.app/Contents/Resources @@ -133,7 +129,7 @@ menu.app/Contents: menu$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM echo -n "APPL????" >menu.app/Contents/PkgInfo - ln -f menu$(EXEEXT) menu.app/Contents/MacOS/menu + ln -f menu menu.app/Contents/MacOS/menu ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc menu.app/Contents/Resources/menu.rsrc @@ -142,7 +138,7 @@ menu.app/Contents: menu$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM @COND_PLATFORM_MACOSX_1@menu_bundle: menu.app/Contents menu_menu.o: $(srcdir)/menu.cpp - $(CXXC) -c -o $@ $(MENU_CXXFLAGS) $< + $(CXX) -c -o $@ $(MENU_CXXFLAGS) $< menu_menu_rc.o: $(srcdir)/menu.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 diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in index 731aec38be..9c15b66d06 100644 --- a/samples/mfc/Makefile.in +++ b/samples/mfc/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 mfctest$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o mfctest Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__mfctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__mfctest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C mfctest$(EXEEXT) +@COND_PLATFORM_MAC_1@__mfctest___mac_setfilecmd = $(SETFILE) -a C mfctest @COND_PLATFORM_WIN32_1@__mfctest___win32rc = mfctest_mfctest_rc.o @COND_PLATFORM_MACOSX_1@__mfctest_bundle___depname = mfctest_bundle ### Targets: ### -all: mfctest$(EXEEXT) $(__mfctest_bundle___depname) +all: mfctest $(__mfctest_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f mfctest$(EXEEXT) + rm -f mfctest rm -rf mfctest.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc) +mfctest: $(MFCTEST_OBJECTS) $(__mfctest___win32rc) $(CXX) -o $@ $(MFCTEST_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) $(__mfctest___mac_rezcmd) $(__mfctest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -mfctest.app/Contents: mfctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +mfctest.app/Contents: mfctest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p mfctest.app/Contents mkdir -p mfctest.app/Contents/MacOS mkdir -p mfctest.app/Contents/Resources @@ -133,7 +129,7 @@ mfctest.app/Contents: mfctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >mfctest.app/Contents/PkgInfo - ln -f mfctest$(EXEEXT) mfctest.app/Contents/MacOS/mfctest + ln -f mfctest mfctest.app/Contents/MacOS/mfctest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mfctest.app/Contents/Resources/mfctest.rsrc @@ -142,7 +138,7 @@ mfctest.app/Contents: mfctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@mfctest_bundle: mfctest.app/Contents mfctest_mfctest.o: $(srcdir)/mfctest.cpp - $(CXXC) -c -o $@ $(MFCTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(MFCTEST_CXXFLAGS) $< mfctest_mfctest_rc.o: $(srcdir)/mfctest.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 diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in index 84bc8c0314..357f714980 100644 --- a/samples/minifram/Makefile.in +++ b/samples/minifram/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 minifram$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o minifram Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__minifram___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__minifram___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C minifram$(EXEEXT) +@COND_PLATFORM_MAC_1@__minifram___mac_setfilecmd = $(SETFILE) -a C minifram @COND_PLATFORM_WIN32_1@__minifram___win32rc = minifram_minifram_rc.o @COND_PLATFORM_MACOSX_1@__minifram_bundle___depname = minifram_bundle ### Targets: ### -all: minifram$(EXEEXT) $(__minifram_bundle___depname) +all: minifram $(__minifram_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f minifram$(EXEEXT) + rm -f minifram rm -rf minifram.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -minifram$(EXEEXT): $(MINIFRAM_OBJECTS) $(__minifram___win32rc) +minifram: $(MINIFRAM_OBJECTS) $(__minifram___win32rc) $(CXX) -o $@ $(MINIFRAM_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) $(__minifram___mac_rezcmd) $(__minifram___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -minifram.app/Contents: minifram$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +minifram.app/Contents: minifram $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p minifram.app/Contents mkdir -p minifram.app/Contents/MacOS mkdir -p minifram.app/Contents/Resources @@ -133,7 +129,7 @@ minifram.app/Contents: minifram$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >minifram.app/Contents/PkgInfo - ln -f minifram$(EXEEXT) minifram.app/Contents/MacOS/minifram + ln -f minifram minifram.app/Contents/MacOS/minifram ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc minifram.app/Contents/Resources/minifram.rsrc @@ -142,7 +138,7 @@ minifram.app/Contents: minifram$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@minifram_bundle: minifram.app/Contents minifram_minifram.o: $(srcdir)/minifram.cpp - $(CXXC) -c -o $@ $(MINIFRAM_CXXFLAGS) $< + $(CXX) -c -o $@ $(MINIFRAM_CXXFLAGS) $< minifram_minifram_rc.o: $(srcdir)/minifram.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 diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index 1039fd3633..3a3c6556f5 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 minimal$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o minimal Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__minimal___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C minimal$(EXEEXT) +@COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = $(SETFILE) -a C minimal @COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_sample_rc.o @COND_PLATFORM_MACOSX_1@__minimal_bundle___depname = minimal_bundle ### Targets: ### -all: minimal$(EXEEXT) $(__minimal_bundle___depname) +all: minimal $(__minimal_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f minimal$(EXEEXT) + rm -f minimal rm -rf minimal.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc) +minimal: $(MINIMAL_OBJECTS) $(__minimal___win32rc) $(CXX) -o $@ $(MINIMAL_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) $(__minimal___mac_rezcmd) $(__minimal___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -minimal.app/Contents: minimal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +minimal.app/Contents: minimal $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p minimal.app/Contents mkdir -p minimal.app/Contents/MacOS mkdir -p minimal.app/Contents/Resources @@ -133,7 +129,7 @@ minimal.app/Contents: minimal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >minimal.app/Contents/PkgInfo - ln -f minimal$(EXEEXT) minimal.app/Contents/MacOS/minimal + ln -f minimal minimal.app/Contents/MacOS/minimal ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc minimal.app/Contents/Resources/minimal.rsrc @@ -142,7 +138,7 @@ minimal.app/Contents: minimal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@minimal_bundle: minimal.app/Contents minimal_minimal.o: $(srcdir)/minimal.cpp - $(CXXC) -c -o $@ $(MINIMAL_CXXFLAGS) $< + $(CXX) -c -o $@ $(MINIMAL_CXXFLAGS) $< minimal_sample_rc.o: $(srcdir)/../../samples/sample.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 diff --git a/samples/mobile/styles/Makefile.in b/samples/mobile/styles/Makefile.in index 54abb068e8..ae7786cc68 100644 --- a/samples/mobile/styles/Makefile.in +++ b/samples/mobile/styles/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 styles$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o styles Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__styles___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__styles___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C styles$(EXEEXT) +@COND_PLATFORM_MAC_1@__styles___mac_setfilecmd = $(SETFILE) -a C styles @COND_PLATFORM_WIN32_1@__styles___win32rc = styles_sample_rc.o @COND_PLATFORM_MACOSX_1@__styles_bundle___depname = styles_bundle ### Targets: ### -all: styles$(EXEEXT) $(__styles_bundle___depname) data +all: styles $(__styles_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f styles$(EXEEXT) + rm -f styles rm -rf styles.app data: @@ -120,13 +116,13 @@ install: all install-strip: install -styles$(EXEEXT): $(STYLES_OBJECTS) $(__styles___win32rc) +styles: $(STYLES_OBJECTS) $(__styles___win32rc) $(CXX) -o $@ $(STYLES_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) $(__styles___mac_rezcmd) $(__styles___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -styles.app/Contents: styles$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +styles.app/Contents: styles $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p styles.app/Contents mkdir -p styles.app/Contents/MacOS mkdir -p styles.app/Contents/Resources @@ -141,7 +137,7 @@ styles.app/Contents: styles$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >styles.app/Contents/PkgInfo - ln -f styles$(EXEEXT) styles.app/Contents/MacOS/styles + ln -f styles styles.app/Contents/MacOS/styles ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc styles.app/Contents/Resources/styles.rsrc @@ -153,7 +149,7 @@ styles_sample_rc.o: $(srcdir)/../../../samples/sample.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 styles_styles.o: $(srcdir)/styles.cpp - $(CXXC) -c -o $@ $(STYLES_CXXFLAGS) $< + $(CXX) -c -o $@ $(STYLES_CXXFLAGS) $< uninstall: diff --git a/samples/mobile/wxedit/Makefile.in b/samples/mobile/wxedit/Makefile.in index 0d0c6ba083..eed6bdb3d7 100644 --- a/samples/mobile/wxedit/Makefile.in +++ b/samples/mobile/wxedit/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 wxedit$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o wxedit Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__wxedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__wxedit___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxedit$(EXEEXT) +@COND_PLATFORM_MAC_1@__wxedit___mac_setfilecmd = $(SETFILE) -a C wxedit @COND_PLATFORM_WIN32_1@__wxedit___win32rc = wxedit_sample_rc.o @COND_PLATFORM_MACOSX_1@__wxedit_bundle___depname = wxedit_bundle ### Targets: ### -all: wxedit$(EXEEXT) $(__wxedit_bundle___depname) +all: wxedit $(__wxedit_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f wxedit$(EXEEXT) + rm -f wxedit rm -rf wxedit.app distclean: clean @@ -114,13 +110,13 @@ install-strip: install uninstall: -wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc) +wxedit: $(WXEDIT_OBJECTS) $(__wxedit___win32rc) $(CXX) -o $@ $(WXEDIT_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) $(__wxedit___mac_rezcmd) $(__wxedit___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -wxedit.app/Contents: wxedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +wxedit.app/Contents: wxedit $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p wxedit.app/Contents mkdir -p wxedit.app/Contents/MacOS mkdir -p wxedit.app/Contents/Resources @@ -135,7 +131,7 @@ wxedit.app/Contents: wxedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >wxedit.app/Contents/PkgInfo - ln -f wxedit$(EXEEXT) wxedit.app/Contents/MacOS/wxedit + ln -f wxedit wxedit.app/Contents/MacOS/wxedit ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc wxedit.app/Contents/Resources/wxedit.rsrc @@ -147,7 +143,7 @@ wxedit_sample_rc.o: $(srcdir)/../../../samples/sample.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 wxedit_wxedit.o: $(srcdir)/wxedit.cpp - $(CXXC) -c -o $@ $(WXEDIT_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXEDIT_CXXFLAGS) $< # Include dependency info, if present: diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in index eda8f8a190..815ea4a3e6 100644 --- a/samples/multimon/Makefile.in +++ b/samples/multimon/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,8 +72,8 @@ WX_VERSION = 2.5.0 @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 multimon_test$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o multimon_test Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) @@ -92,7 +89,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__multimon_test___mac_rezcmd = \ @COND_PLATFORM_MAC_1@ $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__multimon_test___mac_setfilecmd \ -@COND_PLATFORM_MAC_1@ = $(SETFILE) -a C multimon_test$(EXEEXT) +@COND_PLATFORM_MAC_1@ = $(SETFILE) -a C multimon_test @COND_PLATFORM_WIN32_1@__multimon_test___win32rc = \ @COND_PLATFORM_WIN32_1@ multimon_test_sample_rc.o @COND_PLATFORM_MACOSX_1@__multimon_test_bundle___depname \ @@ -100,12 +97,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ ### Targets: ### -all: multimon_test$(EXEEXT) $(__multimon_test_bundle___depname) +all: multimon_test $(__multimon_test_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f multimon_test$(EXEEXT) + rm -f multimon_test rm -rf multimon_test.app distclean: clean @@ -115,13 +112,13 @@ install: all install-strip: install -multimon_test$(EXEEXT): $(MULTIMON_TEST_OBJECTS) $(__multimon_test___win32rc) +multimon_test: $(MULTIMON_TEST_OBJECTS) $(__multimon_test___win32rc) $(CXX) -o $@ $(MULTIMON_TEST_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) $(__multimon_test___mac_rezcmd) $(__multimon_test___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -multimon_test.app/Contents: multimon_test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +multimon_test.app/Contents: multimon_test $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p multimon_test.app/Contents mkdir -p multimon_test.app/Contents/MacOS mkdir -p multimon_test.app/Contents/Resources @@ -136,7 +133,7 @@ multimon_test.app/Contents: multimon_test$(EXEEXT) $(top_srcdir)/src/mac/Info.pl echo -n "APPL????" >multimon_test.app/Contents/PkgInfo - ln -f multimon_test$(EXEEXT) multimon_test.app/Contents/MacOS/multimon_test + ln -f multimon_test multimon_test.app/Contents/MacOS/multimon_test ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc multimon_test.app/Contents/Resources/multimon_test.rsrc @@ -145,7 +142,7 @@ multimon_test.app/Contents: multimon_test$(EXEEXT) $(top_srcdir)/src/mac/Info.pl @COND_PLATFORM_MACOSX_1@multimon_test_bundle: multimon_test.app/Contents multimon_test_multimon_test.o: $(srcdir)/multimon_test.cpp - $(CXXC) -c -o $@ $(MULTIMON_TEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(MULTIMON_TEST_CXXFLAGS) $< multimon_test_sample_rc.o: $(srcdir)/../../samples/sample.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 diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index d3d1f2776d..a709c8a1eb 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 nativdlg$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o nativdlg Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__nativdlg___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__nativdlg___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C nativdlg$(EXEEXT) +@COND_PLATFORM_MAC_1@__nativdlg___mac_setfilecmd = $(SETFILE) -a C nativdlg @COND_PLATFORM_WIN32_1@__nativdlg___win32rc = nativdlg_nativdlg_rc.o @COND_PLATFORM_MACOSX_1@__nativdlg_bundle___depname = nativdlg_bundle ### Targets: ### -all: nativdlg$(EXEEXT) $(__nativdlg_bundle___depname) +all: nativdlg $(__nativdlg_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f nativdlg$(EXEEXT) + rm -f nativdlg rm -rf nativdlg.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc) +nativdlg: $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc) $(CXX) -o $@ $(NATIVDLG_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) $(__nativdlg___mac_rezcmd) $(__nativdlg___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -nativdlg.app/Contents: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +nativdlg.app/Contents: nativdlg $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p nativdlg.app/Contents mkdir -p nativdlg.app/Contents/MacOS mkdir -p nativdlg.app/Contents/Resources @@ -133,7 +129,7 @@ nativdlg.app/Contents: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >nativdlg.app/Contents/PkgInfo - ln -f nativdlg$(EXEEXT) nativdlg.app/Contents/MacOS/nativdlg + ln -f nativdlg nativdlg.app/Contents/MacOS/nativdlg ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc nativdlg.app/Contents/Resources/nativdlg.rsrc @@ -142,7 +138,7 @@ nativdlg.app/Contents: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@nativdlg_bundle: nativdlg.app/Contents nativdlg_nativdlg.o: $(srcdir)/nativdlg.cpp - $(CXXC) -c -o $@ $(NATIVDLG_CXXFLAGS) $< + $(CXX) -c -o $@ $(NATIVDLG_CXXFLAGS) $< nativdlg_nativdlg_rc.o: $(srcdir)/nativdlg.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 diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index 311c6e3208..d87e9bf0f5 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 notebook$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o notebook Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__notebook___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__notebook___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C notebook$(EXEEXT) +@COND_PLATFORM_MAC_1@__notebook___mac_setfilecmd = $(SETFILE) -a C notebook @COND_PLATFORM_WIN32_1@__notebook___win32rc = notebook_notebook_rc.o @COND_PLATFORM_MACOSX_1@__notebook_bundle___depname = notebook_bundle ### Targets: ### -all: notebook$(EXEEXT) $(__notebook_bundle___depname) +all: notebook $(__notebook_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f notebook$(EXEEXT) + rm -f notebook rm -rf notebook.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc) +notebook: $(NOTEBOOK_OBJECTS) $(__notebook___win32rc) $(CXX) -o $@ $(NOTEBOOK_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) $(__notebook___mac_rezcmd) $(__notebook___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -notebook.app/Contents: notebook$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +notebook.app/Contents: notebook $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p notebook.app/Contents mkdir -p notebook.app/Contents/MacOS mkdir -p notebook.app/Contents/Resources @@ -133,7 +129,7 @@ notebook.app/Contents: notebook$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >notebook.app/Contents/PkgInfo - ln -f notebook$(EXEEXT) notebook.app/Contents/MacOS/notebook + ln -f notebook notebook.app/Contents/MacOS/notebook ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc notebook.app/Contents/Resources/notebook.rsrc @@ -142,7 +138,7 @@ notebook.app/Contents: notebook$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@notebook_bundle: notebook.app/Contents notebook_notebook.o: $(srcdir)/notebook.cpp - $(CXXC) -c -o $@ $(NOTEBOOK_CXXFLAGS) $< + $(CXX) -c -o $@ $(NOTEBOOK_CXXFLAGS) $< notebook_notebook_rc.o: $(srcdir)/notebook.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 diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index 0575e239f4..05d8581053 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 oleauto$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o oleauto Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__oleauto___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__oleauto___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C oleauto$(EXEEXT) +@COND_PLATFORM_MAC_1@__oleauto___mac_setfilecmd = $(SETFILE) -a C oleauto @COND_PLATFORM_WIN32_1@__oleauto___win32rc = oleauto_oleauto_rc.o @COND_PLATFORM_MACOSX_1@__oleauto_bundle___depname = oleauto_bundle ### Targets: ### -all: oleauto$(EXEEXT) $(__oleauto_bundle___depname) +all: oleauto $(__oleauto_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f oleauto$(EXEEXT) + rm -f oleauto rm -rf oleauto.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc) +oleauto: $(OLEAUTO_OBJECTS) $(__oleauto___win32rc) $(CXX) -o $@ $(OLEAUTO_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) $(__oleauto___mac_rezcmd) $(__oleauto___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -oleauto.app/Contents: oleauto$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +oleauto.app/Contents: oleauto $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p oleauto.app/Contents mkdir -p oleauto.app/Contents/MacOS mkdir -p oleauto.app/Contents/Resources @@ -133,7 +129,7 @@ oleauto.app/Contents: oleauto$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >oleauto.app/Contents/PkgInfo - ln -f oleauto$(EXEEXT) oleauto.app/Contents/MacOS/oleauto + ln -f oleauto oleauto.app/Contents/MacOS/oleauto ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc oleauto.app/Contents/Resources/oleauto.rsrc @@ -142,7 +138,7 @@ oleauto.app/Contents: oleauto$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@oleauto_bundle: oleauto.app/Contents oleauto_oleauto.o: $(srcdir)/oleauto.cpp - $(CXXC) -c -o $@ $(OLEAUTO_CXXFLAGS) $< + $(CXX) -c -o $@ $(OLEAUTO_CXXFLAGS) $< oleauto_oleauto_rc.o: $(srcdir)/oleauto.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 diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index d8e0a2aa36..123da0bc17 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 cube$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o cube Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,28 +87,27 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__cube___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__cube___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C cube$(EXEEXT) +@COND_PLATFORM_MAC_1@__cube___mac_setfilecmd = $(SETFILE) -a C cube @COND_PLATFORM_WIN32_1@__cube___win32rc = cube_cube_rc.o @COND_PLATFORM_MACOSX_1@__cube_bundle___depname = cube_bundle ### Targets: ### -all: cube$(EXEEXT) $(__cube_bundle___depname) +all: cube $(__cube_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f cube$(EXEEXT) + rm -f cube rm -rf cube.app -cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc) +cube: $(CUBE_OBJECTS) $(__cube___win32rc) $(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-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) $(__cube___mac_rezcmd) $(__cube___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -cube.app/Contents: cube$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +cube.app/Contents: cube $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p cube.app/Contents mkdir -p cube.app/Contents/MacOS mkdir -p cube.app/Contents/Resources @@ -126,7 +122,7 @@ cube.app/Contents: cube$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM echo -n "APPL????" >cube.app/Contents/PkgInfo - ln -f cube$(EXEEXT) cube.app/Contents/MacOS/cube + ln -f cube cube.app/Contents/MacOS/cube ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc cube.app/Contents/Resources/cube.rsrc @@ -135,7 +131,7 @@ cube.app/Contents: cube$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM @COND_PLATFORM_MACOSX_1@cube_bundle: cube.app/Contents cube_cube.o: $(srcdir)/cube.cpp - $(CXXC) -c -o $@ $(CUBE_CXXFLAGS) $< + $(CXX) -c -o $@ $(CUBE_CXXFLAGS) $< cube_cube_rc.o: $(srcdir)/cube.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 diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index 403e251a1e..53aec40fcf 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 isosurf$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o isosurf Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__isosurf___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__isosurf___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C isosurf$(EXEEXT) +@COND_PLATFORM_MAC_1@__isosurf___mac_setfilecmd = $(SETFILE) -a C isosurf @COND_PLATFORM_WIN32_1@__isosurf___win32rc = isosurf_cube_rc.o @COND_PLATFORM_MACOSX_1@__isosurf_bundle___depname = isosurf_bundle ### Targets: ### -all: isosurf$(EXEEXT) $(__isosurf_bundle___depname) data +all: isosurf $(__isosurf_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f isosurf$(EXEEXT) + rm -f isosurf rm -rf isosurf.app data: @@ -120,13 +116,13 @@ install: all install-strip: install -isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc) +isosurf: $(ISOSURF_OBJECTS) $(__isosurf___win32rc) $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-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) $(__isosurf___mac_rezcmd) $(__isosurf___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -isosurf.app/Contents: isosurf$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +isosurf.app/Contents: isosurf $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p isosurf.app/Contents mkdir -p isosurf.app/Contents/MacOS mkdir -p isosurf.app/Contents/Resources @@ -141,7 +137,7 @@ isosurf.app/Contents: isosurf$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >isosurf.app/Contents/PkgInfo - ln -f isosurf$(EXEEXT) isosurf.app/Contents/MacOS/isosurf + ln -f isosurf isosurf.app/Contents/MacOS/isosurf ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc isosurf.app/Contents/Resources/isosurf.rsrc @@ -153,7 +149,7 @@ isosurf_cube_rc.o: $(srcdir)/cube.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 isosurf_isosurf.o: $(srcdir)/isosurf.cpp - $(CXXC) -c -o $@ $(ISOSURF_CXXFLAGS) $< + $(CXX) -c -o $@ $(ISOSURF_CXXFLAGS) $< uninstall: diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index fa039dbf5d..2f9cb10afe 100644 --- a/samples/opengl/penguin/Makefile.in +++ b/samples/opengl/penguin/Makefile.in @@ -15,7 +15,6 @@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -51,10 +50,6 @@ WX_VERSION = 2.5.0 ### Conditionally set variables: ### -@COND_DEPS_TRACKING_0@CCC = $(CC) -@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -84,7 +79,7 @@ WX_VERSION = 2.5.0 @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 penguin$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o penguin Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -99,19 +94,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__penguin___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__penguin___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C penguin$(EXEEXT) +@COND_PLATFORM_MAC_1@__penguin___mac_setfilecmd = $(SETFILE) -a C penguin @COND_PLATFORM_WIN32_1@__penguin___win32rc = penguin_penguin_rc.o @COND_PLATFORM_MACOSX_1@__penguin_bundle___depname = penguin_bundle ### Targets: ### -all: penguin$(EXEEXT) $(__penguin_bundle___depname) data +all: penguin $(__penguin_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f penguin$(EXEEXT) + rm -f penguin rm -rf penguin.app data: @@ -129,13 +123,13 @@ install: all install-strip: install -penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc) +penguin: $(PENGUIN_OBJECTS) $(__penguin___win32rc) $(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-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) $(__penguin___mac_rezcmd) $(__penguin___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -penguin.app/Contents: penguin$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +penguin.app/Contents: penguin $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p penguin.app/Contents mkdir -p penguin.app/Contents/MacOS mkdir -p penguin.app/Contents/Resources @@ -150,7 +144,7 @@ penguin.app/Contents: penguin$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >penguin.app/Contents/PkgInfo - ln -f penguin$(EXEEXT) penguin.app/Contents/MacOS/penguin + ln -f penguin penguin.app/Contents/MacOS/penguin ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc penguin.app/Contents/Resources/penguin.rsrc @@ -159,16 +153,16 @@ penguin.app/Contents: penguin$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@penguin_bundle: penguin.app/Contents penguin_lw.o: $(srcdir)/lw.cpp - $(CXXC) -c -o $@ $(PENGUIN_CXXFLAGS) $< + $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $< penguin_penguin.o: $(srcdir)/penguin.cpp - $(CXXC) -c -o $@ $(PENGUIN_CXXFLAGS) $< + $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $< penguin_penguin_rc.o: $(srcdir)/penguin.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 penguin_trackball.o: $(srcdir)/trackball.c - $(CCC) -c -o $@ $(PENGUIN_CFLAGS) $< + $(CC) -c -o $@ $(PENGUIN_CFLAGS) $< uninstall: diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index a32b445e10..4d46f00717 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 ownerdrw$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o ownerdrw Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__ownerdrw___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__ownerdrw___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C ownerdrw$(EXEEXT) +@COND_PLATFORM_MAC_1@__ownerdrw___mac_setfilecmd = $(SETFILE) -a C ownerdrw @COND_PLATFORM_WIN32_1@__ownerdrw___win32rc = ownerdrw_ownerdrw_rc.o @COND_PLATFORM_MACOSX_1@__ownerdrw_bundle___depname = ownerdrw_bundle ### Targets: ### -all: ownerdrw$(EXEEXT) $(__ownerdrw_bundle___depname) +all: ownerdrw $(__ownerdrw_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f ownerdrw$(EXEEXT) + rm -f ownerdrw rm -rf ownerdrw.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc) +ownerdrw: $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc) $(CXX) -o $@ $(OWNERDRW_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) $(__ownerdrw___mac_rezcmd) $(__ownerdrw___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -ownerdrw.app/Contents: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +ownerdrw.app/Contents: ownerdrw $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p ownerdrw.app/Contents mkdir -p ownerdrw.app/Contents/MacOS mkdir -p ownerdrw.app/Contents/Resources @@ -133,7 +129,7 @@ ownerdrw.app/Contents: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >ownerdrw.app/Contents/PkgInfo - ln -f ownerdrw$(EXEEXT) ownerdrw.app/Contents/MacOS/ownerdrw + ln -f ownerdrw ownerdrw.app/Contents/MacOS/ownerdrw ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc ownerdrw.app/Contents/Resources/ownerdrw.rsrc @@ -142,7 +138,7 @@ ownerdrw.app/Contents: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@ownerdrw_bundle: ownerdrw.app/Contents ownerdrw_ownerdrw.o: $(srcdir)/ownerdrw.cpp - $(CXXC) -c -o $@ $(OWNERDRW_CXXFLAGS) $< + $(CXX) -c -o $@ $(OWNERDRW_CXXFLAGS) $< ownerdrw_ownerdrw_rc.o: $(srcdir)/ownerdrw.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 diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in index a8e0a8ec96..0331c25fe0 100644 --- a/samples/png/Makefile.in +++ b/samples/png/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 png$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o png Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,18 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__png___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__png___mac_setfilecmd = $(SETFILE) -a C png$(EXEEXT) +@COND_PLATFORM_MAC_1@__png___mac_setfilecmd = $(SETFILE) -a C png @COND_PLATFORM_WIN32_1@__png___win32rc = png_pngdemo_rc.o @COND_PLATFORM_MACOSX_1@__png_bundle___depname = png_bundle ### Targets: ### -all: png$(EXEEXT) $(__png_bundle___depname) +all: png $(__png_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f png$(EXEEXT) + rm -f png rm -rf png.app distclean: clean @@ -111,13 +108,13 @@ install: all install-strip: install -png$(EXEEXT): $(PNG_OBJECTS) $(__png___win32rc) +png: $(PNG_OBJECTS) $(__png___win32rc) $(CXX) -o $@ $(PNG_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) $(__png___mac_rezcmd) $(__png___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -png.app/Contents: png$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +png.app/Contents: png $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p png.app/Contents mkdir -p png.app/Contents/MacOS mkdir -p png.app/Contents/Resources @@ -132,7 +129,7 @@ png.app/Contents: png$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME) echo -n "APPL????" >png.app/Contents/PkgInfo - ln -f png$(EXEEXT) png.app/Contents/MacOS/png + ln -f png png.app/Contents/MacOS/png ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc png.app/Contents/Resources/png.rsrc @@ -141,7 +138,7 @@ png.app/Contents: png$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME) @COND_PLATFORM_MACOSX_1@png_bundle: png.app/Contents png_pngdemo.o: $(srcdir)/pngdemo.cpp - $(CXXC) -c -o $@ $(PNG_CXXFLAGS) $< + $(CXX) -c -o $@ $(PNG_CXXFLAGS) $< png_pngdemo_rc.o: $(srcdir)/pngdemo.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 diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index f21380a563..cd184d3b6b 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 printing$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o printing Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__printing___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C printing$(EXEEXT) +@COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = $(SETFILE) -a C printing @COND_PLATFORM_WIN32_1@__printing___win32rc = printing_printing_rc.o @COND_PLATFORM_MACOSX_1@__printing_bundle___depname = printing_bundle ### Targets: ### -all: printing$(EXEEXT) $(__printing_bundle___depname) +all: printing $(__printing_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f printing$(EXEEXT) + rm -f printing rm -rf printing.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc) +printing: $(PRINTING_OBJECTS) $(__printing___win32rc) $(CXX) -o $@ $(PRINTING_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) $(__printing___mac_rezcmd) $(__printing___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -printing.app/Contents: printing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +printing.app/Contents: printing $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p printing.app/Contents mkdir -p printing.app/Contents/MacOS mkdir -p printing.app/Contents/Resources @@ -133,7 +129,7 @@ printing.app/Contents: printing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >printing.app/Contents/PkgInfo - ln -f printing$(EXEEXT) printing.app/Contents/MacOS/printing + ln -f printing printing.app/Contents/MacOS/printing ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc printing.app/Contents/Resources/printing.rsrc @@ -142,7 +138,7 @@ printing.app/Contents: printing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@printing_bundle: printing.app/Contents printing_printing.o: $(srcdir)/printing.cpp - $(CXXC) -c -o $@ $(PRINTING_CXXFLAGS) $< + $(CXX) -c -o $@ $(PRINTING_CXXFLAGS) $< printing_printing_rc.o: $(srcdir)/printing.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 diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in index dc8da06aae..509a6b7496 100644 --- a/samples/propsize/Makefile.in +++ b/samples/propsize/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 propsize$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o propsize Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__propsize___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__propsize___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C propsize$(EXEEXT) +@COND_PLATFORM_MAC_1@__propsize___mac_setfilecmd = $(SETFILE) -a C propsize @COND_PLATFORM_WIN32_1@__propsize___win32rc = propsize_propsize_rc.o @COND_PLATFORM_MACOSX_1@__propsize_bundle___depname = propsize_bundle ### Targets: ### -all: propsize$(EXEEXT) $(__propsize_bundle___depname) +all: propsize $(__propsize_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f propsize$(EXEEXT) + rm -f propsize rm -rf propsize.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -propsize$(EXEEXT): $(PROPSIZE_OBJECTS) $(__propsize___win32rc) +propsize: $(PROPSIZE_OBJECTS) $(__propsize___win32rc) $(CXX) -o $@ $(PROPSIZE_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) $(__propsize___mac_rezcmd) $(__propsize___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -propsize.app/Contents: propsize$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +propsize.app/Contents: propsize $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p propsize.app/Contents mkdir -p propsize.app/Contents/MacOS mkdir -p propsize.app/Contents/Resources @@ -133,7 +129,7 @@ propsize.app/Contents: propsize$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >propsize.app/Contents/PkgInfo - ln -f propsize$(EXEEXT) propsize.app/Contents/MacOS/propsize + ln -f propsize propsize.app/Contents/MacOS/propsize ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc propsize.app/Contents/Resources/propsize.rsrc @@ -142,7 +138,7 @@ propsize.app/Contents: propsize$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@propsize_bundle: propsize.app/Contents propsize_propsize.o: $(srcdir)/propsize.cpp - $(CXXC) -c -o $@ $(PROPSIZE_CXXFLAGS) $< + $(CXX) -c -o $@ $(PROPSIZE_CXXFLAGS) $< propsize_propsize_rc.o: $(srcdir)/propsize.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 diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index 79f70614e6..f16700e2ea 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 regtest$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o regtest Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__regtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__regtest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C regtest$(EXEEXT) +@COND_PLATFORM_MAC_1@__regtest___mac_setfilecmd = $(SETFILE) -a C regtest @COND_PLATFORM_WIN32_1@__regtest___win32rc = regtest_regtest_rc.o @COND_PLATFORM_MACOSX_1@__regtest_bundle___depname = regtest_bundle ### Targets: ### -all: regtest$(EXEEXT) $(__regtest_bundle___depname) +all: regtest $(__regtest_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f regtest$(EXEEXT) + rm -f regtest rm -rf regtest.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc) +regtest: $(REGTEST_OBJECTS) $(__regtest___win32rc) $(CXX) -o $@ $(REGTEST_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) $(__regtest___mac_rezcmd) $(__regtest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -regtest.app/Contents: regtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +regtest.app/Contents: regtest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p regtest.app/Contents mkdir -p regtest.app/Contents/MacOS mkdir -p regtest.app/Contents/Resources @@ -133,7 +129,7 @@ regtest.app/Contents: regtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >regtest.app/Contents/PkgInfo - ln -f regtest$(EXEEXT) regtest.app/Contents/MacOS/regtest + ln -f regtest regtest.app/Contents/MacOS/regtest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc regtest.app/Contents/Resources/regtest.rsrc @@ -142,7 +138,7 @@ regtest.app/Contents: regtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@regtest_bundle: regtest.app/Contents regtest_regtest.o: $(srcdir)/regtest.cpp - $(CXXC) -c -o $@ $(REGTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(REGTEST_CXXFLAGS) $< regtest_regtest_rc.o: $(srcdir)/regtest.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 diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index 23f38127e1..c75d465a40 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -13,8 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -DLLPREFIX_MODULE = @DLLPREFIX_MODULE@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -52,8 +50,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_UNIX_0@PLUGIN_VERSION = 250 @COND_PLATFORM_UNIX_1@PLUGIN_VERSION = -2.5.0 @COND_USE_GUI_0@PORTNAME = base @@ -86,7 +82,7 @@ WX_VERSION = 2.5.0 @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 render$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o render Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -101,24 +97,23 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ COND_SHARED_1___renddll___depname = \ - $(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGIN_VERSION)$(WXCOMPILER).$(SO_SUFFIX_MODULE) + librenddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGIN_VERSION)$(WXCOMPILER).$(SO_SUFFIX_MODULE) @COND_SHARED_1@__renddll___depname = $(COND_SHARED_1___renddll___depname) @COND_PLATFORM_MAC_1@__render___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__render___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C render$(EXEEXT) +@COND_PLATFORM_MAC_1@__render___mac_setfilecmd = $(SETFILE) -a C render @COND_PLATFORM_WIN32_1@__render___win32rc = render_sample_rc.o @COND_PLATFORM_MACOSX_1@__render_bundle___depname = render_bundle ### Targets: ### -all: render$(EXEEXT) $(__render_bundle___depname) $(__renddll___depname) +all: render $(__render_bundle___depname) $(__renddll___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f render$(EXEEXT) + rm -f render rm -rf render.app - rm -f $(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGIN_VERSION)$(WXCOMPILER).$(SO_SUFFIX_MODULE) + rm -f librenddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGIN_VERSION)$(WXCOMPILER).$(SO_SUFFIX_MODULE) distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @@ -127,19 +122,19 @@ install: all install-strip: install -@COND_SHARED_1@$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGIN_VERSION)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(RENDDLL_OBJECTS) +@COND_SHARED_1@librenddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGIN_VERSION)$(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) renddll_renddll.o: $(srcdir)/renddll.cpp - $(CXXC) -c -o $@ $(RENDDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(RENDDLL_CXXFLAGS) $< -render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc) +render: $(RENDER_OBJECTS) $(__render___win32rc) $(CXX) -o $@ $(RENDER_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) $(__render___mac_rezcmd) $(__render___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -render.app/Contents: render$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +render.app/Contents: render $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p render.app/Contents mkdir -p render.app/Contents/MacOS mkdir -p render.app/Contents/Resources @@ -154,7 +149,7 @@ render.app/Contents: render$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >render.app/Contents/PkgInfo - ln -f render$(EXEEXT) render.app/Contents/MacOS/render + ln -f render render.app/Contents/MacOS/render ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc render.app/Contents/Resources/render.rsrc @@ -163,7 +158,7 @@ render.app/Contents: render$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI @COND_PLATFORM_MACOSX_1@render_bundle: render.app/Contents render_render.o: $(srcdir)/render.cpp - $(CXXC) -c -o $@ $(RENDER_CXXFLAGS) $< + $(CXX) -c -o $@ $(RENDER_CXXFLAGS) $< render_sample_rc.o: $(srcdir)/../../samples/sample.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 diff --git a/samples/richedit/Makefile.in b/samples/richedit/Makefile.in index 1b775621a0..184f3cb62e 100644 --- a/samples/richedit/Makefile.in +++ b/samples/richedit/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -48,8 +47,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -79,7 +76,7 @@ WX_VERSION = 2.5.0 @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 richedit$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o richedit Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -94,19 +91,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__richedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__richedit___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C richedit$(EXEEXT) +@COND_PLATFORM_MAC_1@__richedit___mac_setfilecmd = $(SETFILE) -a C richedit @COND_PLATFORM_WIN32_1@__richedit___win32rc = richedit_sample_rc.o @COND_PLATFORM_MACOSX_1@__richedit_bundle___depname = richedit_bundle ### Targets: ### -all: richedit$(EXEEXT) $(__richedit_bundle___depname) +all: richedit $(__richedit_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f richedit$(EXEEXT) + rm -f richedit rm -rf richedit.app distclean: clean @@ -116,13 +112,13 @@ install: all install-strip: install -richedit$(EXEEXT): $(RICHEDIT_OBJECTS) $(__richedit___win32rc) +richedit: $(RICHEDIT_OBJECTS) $(__richedit___win32rc) $(CXX) -o $@ $(RICHEDIT_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) $(__richedit___mac_rezcmd) $(__richedit___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -richedit.app/Contents: richedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +richedit.app/Contents: richedit $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p richedit.app/Contents mkdir -p richedit.app/Contents/MacOS mkdir -p richedit.app/Contents/Resources @@ -137,7 +133,7 @@ richedit.app/Contents: richedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >richedit.app/Contents/PkgInfo - ln -f richedit$(EXEEXT) richedit.app/Contents/MacOS/richedit + ln -f richedit richedit.app/Contents/MacOS/richedit ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc richedit.app/Contents/Resources/richedit.rsrc @@ -146,22 +142,22 @@ richedit.app/Contents: richedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@richedit_bundle: richedit.app/Contents richedit_kbList.o: $(srcdir)/kbList.cpp - $(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $< + $(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $< richedit_sample_rc.o: $(srcdir)/../../samples/sample.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 richedit_wxLayout.o: $(srcdir)/wxLayout.cpp - $(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $< + $(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $< richedit_wxllist.o: $(srcdir)/wxllist.cpp - $(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $< + $(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $< richedit_wxlparser.o: $(srcdir)/wxlparser.cpp - $(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $< + $(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $< richedit_wxlwindow.o: $(srcdir)/wxlwindow.cpp - $(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $< + $(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $< uninstall: diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in index 9ce05ada07..12ed45d634 100644 --- a/samples/rotate/Makefile.in +++ b/samples/rotate/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 rotate$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o rotate Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__rotate___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__rotate___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C rotate$(EXEEXT) +@COND_PLATFORM_MAC_1@__rotate___mac_setfilecmd = $(SETFILE) -a C rotate @COND_PLATFORM_WIN32_1@__rotate___win32rc = rotate_rotate_rc.o @COND_PLATFORM_MACOSX_1@__rotate_bundle___depname = rotate_bundle ### Targets: ### -all: rotate$(EXEEXT) $(__rotate_bundle___depname) data +all: rotate $(__rotate_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f rotate$(EXEEXT) + rm -f rotate rm -rf rotate.app data: @@ -120,13 +116,13 @@ install: all install-strip: install -rotate$(EXEEXT): $(ROTATE_OBJECTS) $(__rotate___win32rc) +rotate: $(ROTATE_OBJECTS) $(__rotate___win32rc) $(CXX) -o $@ $(ROTATE_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) $(__rotate___mac_rezcmd) $(__rotate___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -rotate.app/Contents: rotate$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +rotate.app/Contents: rotate $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p rotate.app/Contents mkdir -p rotate.app/Contents/MacOS mkdir -p rotate.app/Contents/Resources @@ -141,7 +137,7 @@ rotate.app/Contents: rotate$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >rotate.app/Contents/PkgInfo - ln -f rotate$(EXEEXT) rotate.app/Contents/MacOS/rotate + ln -f rotate rotate.app/Contents/MacOS/rotate ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc rotate.app/Contents/Resources/rotate.rsrc @@ -150,7 +146,7 @@ rotate.app/Contents: rotate$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI @COND_PLATFORM_MACOSX_1@rotate_bundle: rotate.app/Contents rotate_rotate.o: $(srcdir)/rotate.cpp - $(CXXC) -c -o $@ $(ROTATE_CXXFLAGS) $< + $(CXX) -c -o $@ $(ROTATE_CXXFLAGS) $< rotate_rotate_rc.o: $(srcdir)/rotate.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 diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index a826bc1444..037381eb0d 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 sashtest$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o sashtest Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -93,19 +90,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__sashtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__sashtest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C sashtest$(EXEEXT) +@COND_PLATFORM_MAC_1@__sashtest___mac_setfilecmd = $(SETFILE) -a C sashtest @COND_PLATFORM_WIN32_1@__sashtest___win32rc = sashtest_sashtest_rc.o @COND_PLATFORM_MACOSX_1@__sashtest_bundle___depname = sashtest_bundle ### Targets: ### -all: sashtest$(EXEEXT) $(__sashtest_bundle___depname) +all: sashtest $(__sashtest_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f sashtest$(EXEEXT) + rm -f sashtest rm -rf sashtest.app distclean: clean @@ -115,13 +111,13 @@ install: all install-strip: install -sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc) +sashtest: $(SASHTEST_OBJECTS) $(__sashtest___win32rc) $(CXX) -o $@ $(SASHTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__sashtest___mac_rezcmd) $(__sashtest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -sashtest.app/Contents: sashtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +sashtest.app/Contents: sashtest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p sashtest.app/Contents mkdir -p sashtest.app/Contents/MacOS mkdir -p sashtest.app/Contents/Resources @@ -136,7 +132,7 @@ sashtest.app/Contents: sashtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >sashtest.app/Contents/PkgInfo - ln -f sashtest$(EXEEXT) sashtest.app/Contents/MacOS/sashtest + ln -f sashtest sashtest.app/Contents/MacOS/sashtest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc sashtest.app/Contents/Resources/sashtest.rsrc @@ -145,7 +141,7 @@ sashtest.app/Contents: sashtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@sashtest_bundle: sashtest.app/Contents sashtest_sashtest.o: $(srcdir)/sashtest.cpp - $(CXXC) -c -o $@ $(SASHTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(SASHTEST_CXXFLAGS) $< sashtest_sashtest_rc.o: $(srcdir)/sashtest.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 diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index 1b05164eb0..27cb09806d 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 scroll$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o scroll Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__scroll___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__scroll___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C scroll$(EXEEXT) +@COND_PLATFORM_MAC_1@__scroll___mac_setfilecmd = $(SETFILE) -a C scroll @COND_PLATFORM_WIN32_1@__scroll___win32rc = scroll_scroll_rc.o @COND_PLATFORM_MACOSX_1@__scroll_bundle___depname = scroll_bundle ### Targets: ### -all: scroll$(EXEEXT) $(__scroll_bundle___depname) +all: scroll $(__scroll_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f scroll$(EXEEXT) + rm -f scroll rm -rf scroll.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc) +scroll: $(SCROLL_OBJECTS) $(__scroll___win32rc) $(CXX) -o $@ $(SCROLL_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) $(__scroll___mac_rezcmd) $(__scroll___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -scroll.app/Contents: scroll$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +scroll.app/Contents: scroll $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p scroll.app/Contents mkdir -p scroll.app/Contents/MacOS mkdir -p scroll.app/Contents/Resources @@ -133,7 +129,7 @@ scroll.app/Contents: scroll$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >scroll.app/Contents/PkgInfo - ln -f scroll$(EXEEXT) scroll.app/Contents/MacOS/scroll + ln -f scroll scroll.app/Contents/MacOS/scroll ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc scroll.app/Contents/Resources/scroll.rsrc @@ -142,7 +138,7 @@ scroll.app/Contents: scroll$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI @COND_PLATFORM_MACOSX_1@scroll_bundle: scroll.app/Contents scroll_scroll.o: $(srcdir)/scroll.cpp - $(CXXC) -c -o $@ $(SCROLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(SCROLL_CXXFLAGS) $< scroll_scroll_rc.o: $(srcdir)/scroll.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 diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in index 90b7f19136..e738545ae6 100644 --- a/samples/scrollsub/Makefile.in +++ b/samples/scrollsub/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 scrollsub$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o scrollsub Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -91,18 +88,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__scrollsub___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__scrollsub___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C scrollsub$(EXEEXT) +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C scrollsub @COND_PLATFORM_WIN32_1@__scrollsub___win32rc = scrollsub_scrollsub_rc.o @COND_PLATFORM_MACOSX_1@__scrollsub_bundle___depname = scrollsub_bundle ### Targets: ### -all: scrollsub$(EXEEXT) $(__scrollsub_bundle___depname) +all: scrollsub $(__scrollsub_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f scrollsub$(EXEEXT) + rm -f scrollsub rm -rf scrollsub.app distclean: clean @@ -112,13 +109,13 @@ install: all install-strip: install -scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc) +scrollsub: $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc) $(CXX) -o $@ $(SCROLLSUB_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) $(__scrollsub___mac_rezcmd) $(__scrollsub___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -scrollsub.app/Contents: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +scrollsub.app/Contents: scrollsub $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p scrollsub.app/Contents mkdir -p scrollsub.app/Contents/MacOS mkdir -p scrollsub.app/Contents/Resources @@ -133,7 +130,7 @@ scrollsub.app/Contents: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $ echo -n "APPL????" >scrollsub.app/Contents/PkgInfo - ln -f scrollsub$(EXEEXT) scrollsub.app/Contents/MacOS/scrollsub + ln -f scrollsub scrollsub.app/Contents/MacOS/scrollsub ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc scrollsub.app/Contents/Resources/scrollsub.rsrc @@ -142,7 +139,7 @@ scrollsub.app/Contents: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $ @COND_PLATFORM_MACOSX_1@scrollsub_bundle: scrollsub.app/Contents scrollsub_scrollsub.o: $(srcdir)/scrollsub.cpp - $(CXXC) -c -o $@ $(SCROLLSUB_CXXFLAGS) $< + $(CXX) -c -o $@ $(SCROLLSUB_CXXFLAGS) $< scrollsub_scrollsub_rc.o: $(srcdir)/scrollsub.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 diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index b03481dbb7..2e3c10491e 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 shaped$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o shaped Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__shaped___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__shaped___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C shaped$(EXEEXT) +@COND_PLATFORM_MAC_1@__shaped___mac_setfilecmd = $(SETFILE) -a C shaped @COND_PLATFORM_WIN32_1@__shaped___win32rc = shaped_shaped_rc.o @COND_PLATFORM_MACOSX_1@__shaped_bundle___depname = shaped_bundle ### Targets: ### -all: shaped$(EXEEXT) $(__shaped_bundle___depname) +all: shaped $(__shaped_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f shaped$(EXEEXT) + rm -f shaped rm -rf shaped.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc) +shaped: $(SHAPED_OBJECTS) $(__shaped___win32rc) $(CXX) -o $@ $(SHAPED_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) $(__shaped___mac_rezcmd) $(__shaped___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -shaped.app/Contents: shaped$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +shaped.app/Contents: shaped $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p shaped.app/Contents mkdir -p shaped.app/Contents/MacOS mkdir -p shaped.app/Contents/Resources @@ -133,7 +129,7 @@ shaped.app/Contents: shaped$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >shaped.app/Contents/PkgInfo - ln -f shaped$(EXEEXT) shaped.app/Contents/MacOS/shaped + ln -f shaped shaped.app/Contents/MacOS/shaped ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc shaped.app/Contents/Resources/shaped.rsrc @@ -142,7 +138,7 @@ shaped.app/Contents: shaped$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI @COND_PLATFORM_MACOSX_1@shaped_bundle: shaped.app/Contents shaped_shaped.o: $(srcdir)/shaped.cpp - $(CXXC) -c -o $@ $(SHAPED_CXXFLAGS) $< + $(CXX) -c -o $@ $(SHAPED_CXXFLAGS) $< shaped_shaped_rc.o: $(srcdir)/shaped.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 diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index b1d4b10115..33665129ef 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -50,8 +49,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -81,12 +78,12 @@ WX_VERSION = 2.5.0 @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o client$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o client Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o server$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o server Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -103,35 +100,33 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_6 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__client___mac_rezcmd = $(__MACOSX_RESOURCES_p_2) -@COND_PLATFORM_MAC_1@__client___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C client$(EXEEXT) +@COND_PLATFORM_MAC_1@__client___mac_setfilecmd = $(SETFILE) -a C client @COND_PLATFORM_WIN32_1@__client___win32rc = client_client_rc.o @COND_PLATFORM_MACOSX_1@__client_bundle___depname = client_bundle @COND_PLATFORM_MAC_1@__server___mac_rezcmd = $(__MACOSX_RESOURCES_p_3) -@COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C server$(EXEEXT) +@COND_PLATFORM_MAC_1@__server___mac_setfilecmd = $(SETFILE) -a C server @COND_PLATFORM_WIN32_1@__server___win32rc = server_server_rc.o @COND_PLATFORM_MACOSX_1@__server_bundle___depname = server_bundle ### Targets: ### -all: client$(EXEEXT) $(__client_bundle___depname) server$(EXEEXT) $(__server_bundle___depname) +all: client $(__client_bundle___depname) server $(__server_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f client$(EXEEXT) + rm -f client rm -rf client.app - rm -f server$(EXEEXT) + rm -f server rm -rf server.app -client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc) +client: $(CLIENT_OBJECTS) $(__client___win32rc) $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__client___mac_rezcmd) $(__client___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -client.app/Contents: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +client.app/Contents: client $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p client.app/Contents mkdir -p client.app/Contents/MacOS mkdir -p client.app/Contents/Resources @@ -146,7 +141,7 @@ client.app/Contents: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >client.app/Contents/PkgInfo - ln -f client$(EXEEXT) client.app/Contents/MacOS/client + ln -f client client.app/Contents/MacOS/client ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc client.app/Contents/Resources/client.rsrc @@ -155,7 +150,7 @@ client.app/Contents: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI @COND_PLATFORM_MACOSX_1@client_bundle: client.app/Contents client_client.o: $(srcdir)/client.cpp - $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $< + $(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $< client_client_rc.o: $(srcdir)/client.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples @@ -167,13 +162,13 @@ install: all install-strip: install -server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc) +server: $(SERVER_OBJECTS) $(__server___win32rc) $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__server___mac_rezcmd) $(__server___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -server.app/Contents: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +server.app/Contents: server $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p server.app/Contents mkdir -p server.app/Contents/MacOS mkdir -p server.app/Contents/Resources @@ -188,7 +183,7 @@ server.app/Contents: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >server.app/Contents/PkgInfo - ln -f server$(EXEEXT) server.app/Contents/MacOS/server + ln -f server server.app/Contents/MacOS/server ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc server.app/Contents/Resources/server.rsrc @@ -197,7 +192,7 @@ server.app/Contents: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI @COND_PLATFORM_MACOSX_1@server_bundle: server.app/Contents server_server.o: $(srcdir)/server.cpp - $(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $< + $(CXX) -c -o $@ $(SERVER_CXXFLAGS) $< server_server_rc.o: $(srcdir)/server.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index 4ef9c62b1d..18a97439cc 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 splitter$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o splitter Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__splitter___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__splitter___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C splitter$(EXEEXT) +@COND_PLATFORM_MAC_1@__splitter___mac_setfilecmd = $(SETFILE) -a C splitter @COND_PLATFORM_WIN32_1@__splitter___win32rc = splitter_splitter_rc.o @COND_PLATFORM_MACOSX_1@__splitter_bundle___depname = splitter_bundle ### Targets: ### -all: splitter$(EXEEXT) $(__splitter_bundle___depname) +all: splitter $(__splitter_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f splitter$(EXEEXT) + rm -f splitter rm -rf splitter.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc) +splitter: $(SPLITTER_OBJECTS) $(__splitter___win32rc) $(CXX) -o $@ $(SPLITTER_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) $(__splitter___mac_rezcmd) $(__splitter___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -splitter.app/Contents: splitter$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +splitter.app/Contents: splitter $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p splitter.app/Contents mkdir -p splitter.app/Contents/MacOS mkdir -p splitter.app/Contents/Resources @@ -133,7 +129,7 @@ splitter.app/Contents: splitter$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >splitter.app/Contents/PkgInfo - ln -f splitter$(EXEEXT) splitter.app/Contents/MacOS/splitter + ln -f splitter splitter.app/Contents/MacOS/splitter ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc splitter.app/Contents/Resources/splitter.rsrc @@ -142,7 +138,7 @@ splitter.app/Contents: splitter$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@splitter_bundle: splitter.app/Contents splitter_splitter.o: $(srcdir)/splitter.cpp - $(CXXC) -c -o $@ $(SPLITTER_CXXFLAGS) $< + $(CXX) -c -o $@ $(SPLITTER_CXXFLAGS) $< splitter_splitter_rc.o: $(srcdir)/splitter.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 diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in index cf14066461..35944fd978 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 statbar$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o statbar Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__statbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__statbar___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C statbar$(EXEEXT) +@COND_PLATFORM_MAC_1@__statbar___mac_setfilecmd = $(SETFILE) -a C statbar @COND_PLATFORM_WIN32_1@__statbar___win32rc = statbar_statbar_rc.o @COND_PLATFORM_MACOSX_1@__statbar_bundle___depname = statbar_bundle ### Targets: ### -all: statbar$(EXEEXT) $(__statbar_bundle___depname) +all: statbar $(__statbar_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f statbar$(EXEEXT) + rm -f statbar rm -rf statbar.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc) +statbar: $(STATBAR_OBJECTS) $(__statbar___win32rc) $(CXX) -o $@ $(STATBAR_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) $(__statbar___mac_rezcmd) $(__statbar___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -statbar.app/Contents: statbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +statbar.app/Contents: statbar $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p statbar.app/Contents mkdir -p statbar.app/Contents/MacOS mkdir -p statbar.app/Contents/Resources @@ -133,7 +129,7 @@ statbar.app/Contents: statbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >statbar.app/Contents/PkgInfo - ln -f statbar$(EXEEXT) statbar.app/Contents/MacOS/statbar + ln -f statbar statbar.app/Contents/MacOS/statbar ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc statbar.app/Contents/Resources/statbar.rsrc @@ -142,7 +138,7 @@ statbar.app/Contents: statbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@statbar_bundle: statbar.app/Contents statbar_statbar.o: $(srcdir)/statbar.cpp - $(CXXC) -c -o $@ $(STATBAR_CXXFLAGS) $< + $(CXX) -c -o $@ $(STATBAR_CXXFLAGS) $< statbar_statbar_rc.o: $(srcdir)/statbar.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 diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in index a309b229ad..575ad37778 100644 --- a/samples/stc/Makefile.in +++ b/samples/stc/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,8 +73,7 @@ WX_VERSION = 2.5.0 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 -i $(srcdir)/../../include -o \ - stctest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - sample.r + stctest Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) @@ -91,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__stctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__stctest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C stctest$(EXEEXT) +@COND_PLATFORM_MAC_1@__stctest___mac_setfilecmd = $(SETFILE) -a C stctest @COND_PLATFORM_WIN32_1@__stctest___win32rc = stctest_sample_rc.o @COND_PLATFORM_MACOSX_1@__stctest_bundle___depname = stctest_bundle ### Targets: ### -all: stctest$(EXEEXT) $(__stctest_bundle___depname) data +all: stctest $(__stctest_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f stctest$(EXEEXT) + rm -f stctest rm -rf stctest.app data: @@ -121,13 +116,13 @@ install: all install-strip: install -stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc) +stctest: $(STCTEST_OBJECTS) $(__stctest___win32rc) $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-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) $(__stctest___mac_rezcmd) $(__stctest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -stctest.app/Contents: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +stctest.app/Contents: stctest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p stctest.app/Contents mkdir -p stctest.app/Contents/MacOS mkdir -p stctest.app/Contents/Resources @@ -142,7 +137,7 @@ stctest.app/Contents: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >stctest.app/Contents/PkgInfo - ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest + ln -f stctest stctest.app/Contents/MacOS/stctest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc stctest.app/Contents/Resources/stctest.rsrc @@ -154,7 +149,7 @@ stctest_sample_rc.o: $(srcdir)/../../../samples/sample.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 stctest_stctest.o: $(srcdir)/stctest.cpp - $(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $< uninstall: diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in index f9074ad528..7e1ed86756 100644 --- a/samples/svg/Makefile.in +++ b/samples/svg/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,8 +73,7 @@ WX_VERSION = 2.5.0 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 -i $(srcdir)/../../include -o \ - svgtest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - sample.r + svgtest Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) @@ -91,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__svgtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__svgtest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C svgtest$(EXEEXT) +@COND_PLATFORM_MAC_1@__svgtest___mac_setfilecmd = $(SETFILE) -a C svgtest @COND_PLATFORM_WIN32_1@__svgtest___win32rc = svgtest_sample_rc.o @COND_PLATFORM_MACOSX_1@__svgtest_bundle___depname = svgtest_bundle ### Targets: ### -all: svgtest$(EXEEXT) $(__svgtest_bundle___depname) +all: svgtest $(__svgtest_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f svgtest$(EXEEXT) + rm -f svgtest rm -rf svgtest.app distclean: clean @@ -113,13 +108,13 @@ install: all install-strip: install -svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc) +svgtest: $(SVGTEST_OBJECTS) $(__svgtest___win32rc) $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-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) $(__svgtest___mac_rezcmd) $(__svgtest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -svgtest.app/Contents: svgtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +svgtest.app/Contents: svgtest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p svgtest.app/Contents mkdir -p svgtest.app/Contents/MacOS mkdir -p svgtest.app/Contents/Resources @@ -134,7 +129,7 @@ svgtest.app/Contents: svgtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >svgtest.app/Contents/PkgInfo - ln -f svgtest$(EXEEXT) svgtest.app/Contents/MacOS/svgtest + ln -f svgtest svgtest.app/Contents/MacOS/svgtest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc svgtest.app/Contents/Resources/svgtest.rsrc @@ -146,7 +141,7 @@ svgtest_sample_rc.o: $(srcdir)/../../../samples/sample.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 svgtest_svgtest.o: $(srcdir)/svgtest.cpp - $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(SVGTEST_CXXFLAGS) $< uninstall: diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in index 3b7789ddf6..f4d41ca51c 100644 --- a/samples/tab/Makefile.in +++ b/samples/tab/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 tab$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o tab Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,18 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__tab___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__tab___mac_setfilecmd = $(SETFILE) -a C tab$(EXEEXT) +@COND_PLATFORM_MAC_1@__tab___mac_setfilecmd = $(SETFILE) -a C tab @COND_PLATFORM_WIN32_1@__tab___win32rc = tab_tab_rc.o @COND_PLATFORM_MACOSX_1@__tab_bundle___depname = tab_bundle ### Targets: ### -all: tab$(EXEEXT) $(__tab_bundle___depname) +all: tab $(__tab_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f tab$(EXEEXT) + rm -f tab rm -rf tab.app distclean: clean @@ -111,13 +108,13 @@ install: all install-strip: install -tab$(EXEEXT): $(TAB_OBJECTS) $(__tab___win32rc) +tab: $(TAB_OBJECTS) $(__tab___win32rc) $(CXX) -o $@ $(TAB_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) $(__tab___mac_rezcmd) $(__tab___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -tab.app/Contents: tab$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +tab.app/Contents: tab $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p tab.app/Contents mkdir -p tab.app/Contents/MacOS mkdir -p tab.app/Contents/Resources @@ -132,7 +129,7 @@ tab.app/Contents: tab$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME) echo -n "APPL????" >tab.app/Contents/PkgInfo - ln -f tab$(EXEEXT) tab.app/Contents/MacOS/tab + ln -f tab tab.app/Contents/MacOS/tab ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc tab.app/Contents/Resources/tab.rsrc @@ -141,7 +138,7 @@ tab.app/Contents: tab$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME) @COND_PLATFORM_MACOSX_1@tab_bundle: tab.app/Contents tab_tab.o: $(srcdir)/tab.cpp - $(CXXC) -c -o $@ $(TAB_CXXFLAGS) $< + $(CXX) -c -o $@ $(TAB_CXXFLAGS) $< tab_tab_rc.o: $(srcdir)/tab.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 diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index f29dae811e..8aeb33d671 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 taskbar$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o taskbar Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -93,19 +90,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__taskbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__taskbar___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C taskbar$(EXEEXT) +@COND_PLATFORM_MAC_1@__taskbar___mac_setfilecmd = $(SETFILE) -a C taskbar @COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_tbtest_rc.o @COND_PLATFORM_MACOSX_1@__taskbar_bundle___depname = taskbar_bundle ### Targets: ### -all: taskbar$(EXEEXT) $(__taskbar_bundle___depname) +all: taskbar $(__taskbar_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f taskbar$(EXEEXT) + rm -f taskbar rm -rf taskbar.app distclean: clean @@ -115,13 +111,13 @@ install: all install-strip: install -taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc) +taskbar: $(TASKBAR_OBJECTS) $(__taskbar___win32rc) $(CXX) -o $@ $(TASKBAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__taskbar___mac_rezcmd) $(__taskbar___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -taskbar.app/Contents: taskbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +taskbar.app/Contents: taskbar $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p taskbar.app/Contents mkdir -p taskbar.app/Contents/MacOS mkdir -p taskbar.app/Contents/Resources @@ -136,7 +132,7 @@ taskbar.app/Contents: taskbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >taskbar.app/Contents/PkgInfo - ln -f taskbar$(EXEEXT) taskbar.app/Contents/MacOS/taskbar + ln -f taskbar taskbar.app/Contents/MacOS/taskbar ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc taskbar.app/Contents/Resources/taskbar.rsrc @@ -145,7 +141,7 @@ taskbar.app/Contents: taskbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@taskbar_bundle: taskbar.app/Contents taskbar_tbtest.o: $(srcdir)/tbtest.cpp - $(CXXC) -c -o $@ $(TASKBAR_CXXFLAGS) $< + $(CXX) -c -o $@ $(TASKBAR_CXXFLAGS) $< taskbar_tbtest_rc.o: $(srcdir)/tbtest.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 diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index 3ca1b14d9a..c79e6a1681 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 text$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o text Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__text___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__text___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C text$(EXEEXT) +@COND_PLATFORM_MAC_1@__text___mac_setfilecmd = $(SETFILE) -a C text @COND_PLATFORM_WIN32_1@__text___win32rc = text_text_rc.o @COND_PLATFORM_MACOSX_1@__text_bundle___depname = text_bundle ### Targets: ### -all: text$(EXEEXT) $(__text_bundle___depname) +all: text $(__text_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f text$(EXEEXT) + rm -f text rm -rf text.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc) +text: $(TEXT_OBJECTS) $(__text___win32rc) $(CXX) -o $@ $(TEXT_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) $(__text___mac_rezcmd) $(__text___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -text.app/Contents: text$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +text.app/Contents: text $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p text.app/Contents mkdir -p text.app/Contents/MacOS mkdir -p text.app/Contents/Resources @@ -133,7 +129,7 @@ text.app/Contents: text$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM echo -n "APPL????" >text.app/Contents/PkgInfo - ln -f text$(EXEEXT) text.app/Contents/MacOS/text + ln -f text text.app/Contents/MacOS/text ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc text.app/Contents/Resources/text.rsrc @@ -142,7 +138,7 @@ text.app/Contents: text$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM @COND_PLATFORM_MACOSX_1@text_bundle: text.app/Contents text_text.o: $(srcdir)/text.cpp - $(CXXC) -c -o $@ $(TEXT_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEXT_CXXFLAGS) $< text_text_rc.o: $(srcdir)/text.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 diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index 3979d575da..8c5be78d06 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 thread$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o thread Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__thread___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__thread___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C thread$(EXEEXT) +@COND_PLATFORM_MAC_1@__thread___mac_setfilecmd = $(SETFILE) -a C thread @COND_PLATFORM_WIN32_1@__thread___win32rc = thread_thread_rc.o @COND_PLATFORM_MACOSX_1@__thread_bundle___depname = thread_bundle ### Targets: ### -all: thread$(EXEEXT) $(__thread_bundle___depname) +all: thread $(__thread_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f thread$(EXEEXT) + rm -f thread rm -rf thread.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc) +thread: $(THREAD_OBJECTS) $(__thread___win32rc) $(CXX) -o $@ $(THREAD_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) $(__thread___mac_rezcmd) $(__thread___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -thread.app/Contents: thread$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +thread.app/Contents: thread $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p thread.app/Contents mkdir -p thread.app/Contents/MacOS mkdir -p thread.app/Contents/Resources @@ -133,7 +129,7 @@ thread.app/Contents: thread$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >thread.app/Contents/PkgInfo - ln -f thread$(EXEEXT) thread.app/Contents/MacOS/thread + ln -f thread thread.app/Contents/MacOS/thread ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc thread.app/Contents/Resources/thread.rsrc @@ -142,7 +138,7 @@ thread.app/Contents: thread$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI @COND_PLATFORM_MACOSX_1@thread_bundle: thread.app/Contents thread_thread.o: $(srcdir)/thread.cpp - $(CXXC) -c -o $@ $(THREAD_CXXFLAGS) $< + $(CXX) -c -o $@ $(THREAD_CXXFLAGS) $< thread_thread_rc.o: $(srcdir)/thread.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 diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index 58ebb58fa2..a870be2f9a 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 toolbar$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o toolbar Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__toolbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__toolbar___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C toolbar$(EXEEXT) +@COND_PLATFORM_MAC_1@__toolbar___mac_setfilecmd = $(SETFILE) -a C toolbar @COND_PLATFORM_WIN32_1@__toolbar___win32rc = toolbar_toolbar_rc.o @COND_PLATFORM_MACOSX_1@__toolbar_bundle___depname = toolbar_bundle ### Targets: ### -all: toolbar$(EXEEXT) $(__toolbar_bundle___depname) +all: toolbar $(__toolbar_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f toolbar$(EXEEXT) + rm -f toolbar rm -rf toolbar.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc) +toolbar: $(TOOLBAR_OBJECTS) $(__toolbar___win32rc) $(CXX) -o $@ $(TOOLBAR_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) $(__toolbar___mac_rezcmd) $(__toolbar___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -toolbar.app/Contents: toolbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +toolbar.app/Contents: toolbar $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p toolbar.app/Contents mkdir -p toolbar.app/Contents/MacOS mkdir -p toolbar.app/Contents/Resources @@ -133,7 +129,7 @@ toolbar.app/Contents: toolbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >toolbar.app/Contents/PkgInfo - ln -f toolbar$(EXEEXT) toolbar.app/Contents/MacOS/toolbar + ln -f toolbar toolbar.app/Contents/MacOS/toolbar ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc toolbar.app/Contents/Resources/toolbar.rsrc @@ -142,7 +138,7 @@ toolbar.app/Contents: toolbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@toolbar_bundle: toolbar.app/Contents toolbar_toolbar.o: $(srcdir)/toolbar.cpp - $(CXXC) -c -o $@ $(TOOLBAR_CXXFLAGS) $< + $(CXX) -c -o $@ $(TOOLBAR_CXXFLAGS) $< toolbar_toolbar_rc.o: $(srcdir)/toolbar.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 diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index c61bfb79fe..079dc7c436 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 treectrl$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o treectrl Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__treectrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__treectrl___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C treectrl$(EXEEXT) +@COND_PLATFORM_MAC_1@__treectrl___mac_setfilecmd = $(SETFILE) -a C treectrl @COND_PLATFORM_WIN32_1@__treectrl___win32rc = treectrl_treetest_rc.o @COND_PLATFORM_MACOSX_1@__treectrl_bundle___depname = treectrl_bundle ### Targets: ### -all: treectrl$(EXEEXT) $(__treectrl_bundle___depname) +all: treectrl $(__treectrl_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f treectrl$(EXEEXT) + rm -f treectrl rm -rf treectrl.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc) +treectrl: $(TREECTRL_OBJECTS) $(__treectrl___win32rc) $(CXX) -o $@ $(TREECTRL_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) $(__treectrl___mac_rezcmd) $(__treectrl___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -treectrl.app/Contents: treectrl$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +treectrl.app/Contents: treectrl $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p treectrl.app/Contents mkdir -p treectrl.app/Contents/MacOS mkdir -p treectrl.app/Contents/Resources @@ -133,7 +129,7 @@ treectrl.app/Contents: treectrl$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >treectrl.app/Contents/PkgInfo - ln -f treectrl$(EXEEXT) treectrl.app/Contents/MacOS/treectrl + ln -f treectrl treectrl.app/Contents/MacOS/treectrl ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc treectrl.app/Contents/Resources/treectrl.rsrc @@ -142,7 +138,7 @@ treectrl.app/Contents: treectrl$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@treectrl_bundle: treectrl.app/Contents treectrl_treetest.o: $(srcdir)/treetest.cpp - $(CXXC) -c -o $@ $(TREECTRL_CXXFLAGS) $< + $(CXX) -c -o $@ $(TREECTRL_CXXFLAGS) $< treectrl_treetest_rc.o: $(srcdir)/treetest.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 diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index 7cfe235d9a..e2281f7aa5 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 typetest$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o typetest Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__typetest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__typetest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C typetest$(EXEEXT) +@COND_PLATFORM_MAC_1@__typetest___mac_setfilecmd = $(SETFILE) -a C typetest @COND_PLATFORM_WIN32_1@__typetest___win32rc = typetest_typetest_rc.o @COND_PLATFORM_MACOSX_1@__typetest_bundle___depname = typetest_bundle ### Targets: ### -all: typetest$(EXEEXT) $(__typetest_bundle___depname) +all: typetest $(__typetest_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f typetest$(EXEEXT) + rm -f typetest rm -rf typetest.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc) +typetest: $(TYPETEST_OBJECTS) $(__typetest___win32rc) $(CXX) -o $@ $(TYPETEST_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) $(__typetest___mac_rezcmd) $(__typetest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -typetest.app/Contents: typetest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +typetest.app/Contents: typetest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p typetest.app/Contents mkdir -p typetest.app/Contents/MacOS mkdir -p typetest.app/Contents/Resources @@ -133,7 +129,7 @@ typetest.app/Contents: typetest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >typetest.app/Contents/PkgInfo - ln -f typetest$(EXEEXT) typetest.app/Contents/MacOS/typetest + ln -f typetest typetest.app/Contents/MacOS/typetest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc typetest.app/Contents/Resources/typetest.rsrc @@ -142,7 +138,7 @@ typetest.app/Contents: typetest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@typetest_bundle: typetest.app/Contents typetest_typetest.o: $(srcdir)/typetest.cpp - $(CXXC) -c -o $@ $(TYPETEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(TYPETEST_CXXFLAGS) $< typetest_typetest_rc.o: $(srcdir)/typetest.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 diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index df6ff7b936..6cb8309734 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o validate Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @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_setfilecmd = $(SETFILE) -a C validate @COND_PLATFORM_WIN32_1@__validate___win32rc = validate_validate_rc.o @COND_PLATFORM_MACOSX_1@__validate_bundle___depname = validate_bundle ### Targets: ### -all: validate$(EXEEXT) $(__validate_bundle___depname) +all: validate $(__validate_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f validate$(EXEEXT) + rm -f validate rm -rf validate.app distclean: clean @@ -114,13 +110,13 @@ install-strip: install uninstall: -validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc) +validate: $(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) $(__validate___mac_rezcmd) $(__validate___mac_setfilecmd) $(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: validate $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p validate.app/Contents mkdir -p validate.app/Contents/MacOS mkdir -p validate.app/Contents/Resources @@ -135,7 +131,7 @@ validate.app/Contents: validate$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >validate.app/Contents/PkgInfo - ln -f validate$(EXEEXT) validate.app/Contents/MacOS/validate + ln -f validate validate.app/Contents/MacOS/validate ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc validate.app/Contents/Resources/validate.rsrc @@ -144,7 +140,7 @@ validate.app/Contents: validate$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@validate_bundle: validate.app/Contents validate_validate.o: $(srcdir)/validate.cpp - $(CXXC) -c -o $@ $(VALIDATE_CXXFLAGS) $< + $(CXX) -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 diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index 6980ea59fb..a3af1a1db5 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 vstest$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o vstest Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__vstest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__vstest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C vstest$(EXEEXT) +@COND_PLATFORM_MAC_1@__vstest___mac_setfilecmd = $(SETFILE) -a C vstest @COND_PLATFORM_WIN32_1@__vstest___win32rc = vstest_sample_rc.o @COND_PLATFORM_MACOSX_1@__vstest_bundle___depname = vstest_bundle ### Targets: ### -all: vstest$(EXEEXT) $(__vstest_bundle___depname) +all: vstest $(__vstest_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f vstest$(EXEEXT) + rm -f vstest rm -rf vstest.app distclean: clean @@ -114,13 +110,13 @@ install-strip: install uninstall: -vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc) +vstest: $(VSTEST_OBJECTS) $(__vstest___win32rc) $(CXX) -o $@ $(VSTEST_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) $(__vstest___mac_rezcmd) $(__vstest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -vstest.app/Contents: vstest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +vstest.app/Contents: vstest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p vstest.app/Contents mkdir -p vstest.app/Contents/MacOS mkdir -p vstest.app/Contents/Resources @@ -135,7 +131,7 @@ vstest.app/Contents: vstest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >vstest.app/Contents/PkgInfo - ln -f vstest$(EXEEXT) vstest.app/Contents/MacOS/vstest + ln -f vstest vstest.app/Contents/MacOS/vstest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc vstest.app/Contents/Resources/vstest.rsrc @@ -147,7 +143,7 @@ vstest_sample_rc.o: $(srcdir)/../../samples/sample.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 vstest_vstest.o: $(srcdir)/vstest.cpp - $(CXXC) -c -o $@ $(VSTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(VSTEST_CXXFLAGS) $< # Include dependency info, if present: diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in index fddfc1bfd9..cdeb2e399f 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -54,8 +53,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -85,7 +82,7 @@ WX_VERSION = 2.5.0 @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 widgets$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o widgets Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -100,19 +97,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__widgets___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__widgets___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C widgets$(EXEEXT) +@COND_PLATFORM_MAC_1@__widgets___mac_setfilecmd = $(SETFILE) -a C widgets @COND_PLATFORM_WIN32_1@__widgets___win32rc = widgets_widgets_rc.o @COND_PLATFORM_MACOSX_1@__widgets_bundle___depname = widgets_bundle ### Targets: ### -all: widgets$(EXEEXT) $(__widgets_bundle___depname) +all: widgets $(__widgets_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f widgets$(EXEEXT) + rm -f widgets rm -rf widgets.app distclean: clean @@ -124,13 +120,13 @@ install-strip: install uninstall: -widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc) +widgets: $(WIDGETS_OBJECTS) $(__widgets___win32rc) $(CXX) -o $@ $(WIDGETS_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) $(__widgets___mac_rezcmd) $(__widgets___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -widgets.app/Contents: widgets$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +widgets.app/Contents: widgets $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p widgets.app/Contents mkdir -p widgets.app/Contents/MacOS mkdir -p widgets.app/Contents/Resources @@ -145,7 +141,7 @@ widgets.app/Contents: widgets$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >widgets.app/Contents/PkgInfo - ln -f widgets$(EXEEXT) widgets.app/Contents/MacOS/widgets + ln -f widgets widgets.app/Contents/MacOS/widgets ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc widgets.app/Contents/Resources/widgets.rsrc @@ -154,37 +150,37 @@ widgets.app/Contents: widgets$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@widgets_bundle: widgets.app/Contents widgets_button.o: $(srcdir)/button.cpp - $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $< widgets_combobox.o: $(srcdir)/combobox.cpp - $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $< widgets_gauge.o: $(srcdir)/gauge.cpp - $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $< widgets_listbox.o: $(srcdir)/listbox.cpp - $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $< widgets_notebook.o: $(srcdir)/notebook.cpp - $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $< widgets_radiobox.o: $(srcdir)/radiobox.cpp - $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $< widgets_slider.o: $(srcdir)/slider.cpp - $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $< widgets_spinbtn.o: $(srcdir)/spinbtn.cpp - $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $< widgets_static.o: $(srcdir)/static.cpp - $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $< widgets_textctrl.o: $(srcdir)/textctrl.cpp - $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $< widgets_widgets.o: $(srcdir)/widgets.cpp - $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $< widgets_widgets_rc.o: $(srcdir)/widgets.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 diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index 7c66cea77d..d6d2778ba9 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @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 wizard$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o wizard Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -93,19 +90,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__wizard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__wizard___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wizard$(EXEEXT) +@COND_PLATFORM_MAC_1@__wizard___mac_setfilecmd = $(SETFILE) -a C wizard @COND_PLATFORM_WIN32_1@__wizard___win32rc = wizard_wizard_rc.o @COND_PLATFORM_MACOSX_1@__wizard_bundle___depname = wizard_bundle ### Targets: ### -all: wizard$(EXEEXT) $(__wizard_bundle___depname) +all: wizard $(__wizard_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f wizard$(EXEEXT) + rm -f wizard rm -rf wizard.app distclean: clean @@ -117,13 +113,13 @@ install-strip: install uninstall: -wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc) +wizard: $(WIZARD_OBJECTS) $(__wizard___win32rc) $(CXX) -o $@ $(WIZARD_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__wizard___mac_rezcmd) $(__wizard___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -wizard.app/Contents: wizard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +wizard.app/Contents: wizard $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p wizard.app/Contents mkdir -p wizard.app/Contents/MacOS mkdir -p wizard.app/Contents/Resources @@ -138,7 +134,7 @@ wizard.app/Contents: wizard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >wizard.app/Contents/PkgInfo - ln -f wizard$(EXEEXT) wizard.app/Contents/MacOS/wizard + ln -f wizard wizard.app/Contents/MacOS/wizard ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc wizard.app/Contents/Resources/wizard.rsrc @@ -147,7 +143,7 @@ wizard.app/Contents: wizard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI @COND_PLATFORM_MACOSX_1@wizard_bundle: wizard.app/Contents wizard_wizard.o: $(srcdir)/wizard.cpp - $(CXXC) -c -o $@ $(WIZARD_CXXFLAGS) $< + $(CXX) -c -o $@ $(WIZARD_CXXFLAGS) $< wizard_wizard_rc.o: $(srcdir)/wizard.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 diff --git a/samples/wxtest/Makefile.in b/samples/wxtest/Makefile.in index 46d70ef96f..6168296bbd 100644 --- a/samples/wxtest/Makefile.in +++ b/samples/wxtest/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -45,8 +44,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_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,7 +73,7 @@ WX_VERSION = 2.5.0 @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 wxtest$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o wxtest Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -91,19 +88,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__wxtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__wxtest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxtest$(EXEEXT) +@COND_PLATFORM_MAC_1@__wxtest___mac_setfilecmd = $(SETFILE) -a C wxtest @COND_PLATFORM_WIN32_1@__wxtest___win32rc = wxtest_sample_rc.o @COND_PLATFORM_MACOSX_1@__wxtest_bundle___depname = wxtest_bundle ### Targets: ### -all: wxtest$(EXEEXT) $(__wxtest_bundle___depname) +all: wxtest $(__wxtest_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f wxtest$(EXEEXT) + rm -f wxtest rm -rf wxtest.app distclean: clean @@ -115,13 +111,13 @@ install-strip: install uninstall: -wxtest$(EXEEXT): $(WXTEST_OBJECTS) $(__wxtest___win32rc) +wxtest: $(WXTEST_OBJECTS) $(__wxtest___win32rc) $(CXX) -o $@ $(WXTEST_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) $(__wxtest___mac_rezcmd) $(__wxtest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -wxtest.app/Contents: wxtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +wxtest.app/Contents: wxtest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p wxtest.app/Contents mkdir -p wxtest.app/Contents/MacOS mkdir -p wxtest.app/Contents/Resources @@ -136,7 +132,7 @@ wxtest.app/Contents: wxtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI echo -n "APPL????" >wxtest.app/Contents/PkgInfo - ln -f wxtest$(EXEEXT) wxtest.app/Contents/MacOS/wxtest + ln -f wxtest wxtest.app/Contents/MacOS/wxtest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc wxtest.app/Contents/Resources/wxtest.rsrc @@ -148,10 +144,10 @@ wxtest_sample_rc.o: $(srcdir)/../../samples/sample.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 wxtest_test.o: $(srcdir)/test.cpp - $(CXXC) -c -o $@ $(WXTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXTEST_CXXFLAGS) $< wxtest_test_wdr.o: $(srcdir)/test_wdr.cpp - $(CXXC) -c -o $@ $(WXTEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXTEST_CXXFLAGS) $< # Include dependency info, if present: diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index b3df86261c..fcdee820b9 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -47,8 +46,6 @@ XRCDEMO_OBJECTS = \ ### Conditionally set variables: ### -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -79,8 +76,7 @@ XRCDEMO_OBJECTS = \ 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 -i $(srcdir)/../../include -o \ - xrcdemo$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - sample.r + xrcdemo Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) @@ -99,19 +95,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__xrcdemo___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C xrcdemo$(EXEEXT) +@COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = $(SETFILE) -a C xrcdemo @COND_PLATFORM_WIN32_1@__xrcdemo___win32rc = xrcdemo_xrcdemo_rc.o @COND_PLATFORM_MACOSX_1@__xrcdemo_bundle___depname = xrcdemo_bundle ### Targets: ### -all: xrcdemo$(EXEEXT) $(__xrcdemo_bundle___depname) data +all: xrcdemo $(__xrcdemo_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f xrcdemo$(EXEEXT) + rm -f xrcdemo rm -rf xrcdemo.app data: @@ -131,13 +126,13 @@ install-strip: install uninstall: -xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) +xrcdemo: $(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) $(__xrcdemo___mac_rezcmd) $(__xrcdemo___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -xrcdemo.app/Contents: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +xrcdemo.app/Contents: xrcdemo $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p xrcdemo.app/Contents mkdir -p xrcdemo.app/Contents/MacOS mkdir -p xrcdemo.app/Contents/Resources @@ -152,7 +147,7 @@ xrcdemo.app/Contents: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB echo -n "APPL????" >xrcdemo.app/Contents/PkgInfo - ln -f xrcdemo$(EXEEXT) xrcdemo.app/Contents/MacOS/xrcdemo + ln -f xrcdemo xrcdemo.app/Contents/MacOS/xrcdemo ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc xrcdemo.app/Contents/Resources/xrcdemo.rsrc @@ -161,16 +156,16 @@ xrcdemo.app/Contents: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB @COND_PLATFORM_MACOSX_1@xrcdemo_bundle: xrcdemo.app/Contents xrcdemo_custclas.o: $(srcdir)/custclas.cpp - $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< xrcdemo_derivdlg.o: $(srcdir)/derivdlg.cpp - $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< xrcdemo_myframe.o: $(srcdir)/myframe.cpp - $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp - $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.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 --include-dir $(srcdir)/../../include diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in index c09d28eb85..b60d1e622b 100644 --- a/src/stc/Makefile.in +++ b/src/stc/Makefile.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@ @@ -155,10 +151,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) @@ -202,42 +194,42 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_SHARED_1@__install_stcdll___depname = install_stcdll @COND_SHARED_0@__install_stclib___depname = install_stclib COND_SHARED_1___stcdll___depname = \ - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) + $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) @COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname) COND_PLATFORM_WIN32_1___stcdll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_PLATFORM_WIN32_1@__stcdll___importlib = $(COND_PLATFORM_WIN32_1___stcdll___importlib) COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd = -install_name \ - $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) + $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) @COND_PLATFORM_MACOSX_1@__stcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__stcdll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ @COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX)) @COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___stcdll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) @COND_USE_SOVERLINUX_1@__stcdll___soname_flags = $(COND_USE_SOVERLINUX_1___stcdll___soname_flags) COND_USE_SOVERSOLARIS_1___stcdll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__stcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___stcdll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__stcdll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @@ -260,186 +252,186 @@ all: $(__stcdll___depname) $(__stclib___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) + rm -f $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-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_stcdll___depname) $(__install_stclib___depname) - $(INSTALL_DIR) $(includedir) + $(INSTALL) -d $(includedir) for f in wx/stc/stc.h; 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)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) + $(STRIP) $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) @COND_SHARED_1@install_stcdll: -@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL) -d $(libdir) +@COND_SHARED_1@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(libdir) +@COND_SHARED_1@ install -c $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__stcdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_stclib: -@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL) -d $(libdir) +@COND_SHARED_0@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a $(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(__stcdll___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@ $(__stcdll___so_symlinks_cmd) stcdll_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_CallTip.o: $(srcdir)/scintilla/src/CallTip.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_CellBuffer.o: $(srcdir)/scintilla/src/CellBuffer.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_ContractionState.o: $(srcdir)/scintilla/src/ContractionState.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_Document.o: $(srcdir)/scintilla/src/Document.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_DocumentAccessor.o: $(srcdir)/scintilla/src/DocumentAccessor.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_Editor.o: $(srcdir)/scintilla/src/Editor.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_ExternalLexer.o: $(srcdir)/scintilla/src/ExternalLexer.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_Indicator.o: $(srcdir)/scintilla/src/Indicator.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_KeyMap.o: $(srcdir)/scintilla/src/KeyMap.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_KeyWords.o: $(srcdir)/scintilla/src/KeyWords.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexAVE.o: $(srcdir)/scintilla/src/LexAVE.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexAda.o: $(srcdir)/scintilla/src/LexAda.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexAsm.o: $(srcdir)/scintilla/src/LexAsm.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexBaan.o: $(srcdir)/scintilla/src/LexBaan.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexBullant.o: $(srcdir)/scintilla/src/LexBullant.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexCPP.o: $(srcdir)/scintilla/src/LexCPP.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexCSS.o: $(srcdir)/scintilla/src/LexCSS.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexConf.o: $(srcdir)/scintilla/src/LexConf.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexCrontab.o: $(srcdir)/scintilla/src/LexCrontab.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexEScript.o: $(srcdir)/scintilla/src/LexEScript.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexFortran.o: $(srcdir)/scintilla/src/LexFortran.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexHTML.o: $(srcdir)/scintilla/src/LexHTML.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexLisp.o: $(srcdir)/scintilla/src/LexLisp.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexLout.o: $(srcdir)/scintilla/src/LexLout.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexLua.o: $(srcdir)/scintilla/src/LexLua.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexPerl.o: $(srcdir)/scintilla/src/LexPerl.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexPython.o: $(srcdir)/scintilla/src/LexPython.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexRuby.o: $(srcdir)/scintilla/src/LexRuby.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexSQL.o: $(srcdir)/scintilla/src/LexSQL.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexVB.o: $(srcdir)/scintilla/src/LexVB.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LineMarker.o: $(srcdir)/scintilla/src/LineMarker.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_PlatWX.o: $(srcdir)/PlatWX.cpp - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_PropSet.o: $(srcdir)/scintilla/src/PropSet.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_RESearch.o: $(srcdir)/scintilla/src/RESearch.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_ScintillaBase.o: $(srcdir)/scintilla/src/ScintillaBase.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_ScintillaWX.o: $(srcdir)/ScintillaWX.cpp - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_Style.o: $(srcdir)/scintilla/src/Style.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_StyleContext.o: $(srcdir)/scintilla/src/StyleContext.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_UniConversion.o: $(srcdir)/scintilla/src/UniConversion.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_ViewStyle.o: $(srcdir)/scintilla/src/ViewStyle.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_WindowAccessor.o: $(srcdir)/scintilla/src/WindowAccessor.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_XPM.o: $(srcdir)/scintilla/src/XPM.cxx - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_stc.o: $(srcdir)/stc.cpp - $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< @COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a: $(STCLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @@ -447,151 +439,151 @@ stcdll_stc.o: $(srcdir)/stc.cpp @COND_SHARED_0@ $(RANLIB) $@ stclib_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_CallTip.o: $(srcdir)/scintilla/src/CallTip.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_CellBuffer.o: $(srcdir)/scintilla/src/CellBuffer.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_ContractionState.o: $(srcdir)/scintilla/src/ContractionState.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_Document.o: $(srcdir)/scintilla/src/Document.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_DocumentAccessor.o: $(srcdir)/scintilla/src/DocumentAccessor.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_Editor.o: $(srcdir)/scintilla/src/Editor.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_ExternalLexer.o: $(srcdir)/scintilla/src/ExternalLexer.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_Indicator.o: $(srcdir)/scintilla/src/Indicator.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_KeyMap.o: $(srcdir)/scintilla/src/KeyMap.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_KeyWords.o: $(srcdir)/scintilla/src/KeyWords.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexAVE.o: $(srcdir)/scintilla/src/LexAVE.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexAda.o: $(srcdir)/scintilla/src/LexAda.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexAsm.o: $(srcdir)/scintilla/src/LexAsm.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexBaan.o: $(srcdir)/scintilla/src/LexBaan.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexBullant.o: $(srcdir)/scintilla/src/LexBullant.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexCPP.o: $(srcdir)/scintilla/src/LexCPP.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexCSS.o: $(srcdir)/scintilla/src/LexCSS.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexConf.o: $(srcdir)/scintilla/src/LexConf.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexCrontab.o: $(srcdir)/scintilla/src/LexCrontab.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexEScript.o: $(srcdir)/scintilla/src/LexEScript.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexFortran.o: $(srcdir)/scintilla/src/LexFortran.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexHTML.o: $(srcdir)/scintilla/src/LexHTML.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexLisp.o: $(srcdir)/scintilla/src/LexLisp.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexLout.o: $(srcdir)/scintilla/src/LexLout.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexLua.o: $(srcdir)/scintilla/src/LexLua.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexPerl.o: $(srcdir)/scintilla/src/LexPerl.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexPython.o: $(srcdir)/scintilla/src/LexPython.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexRuby.o: $(srcdir)/scintilla/src/LexRuby.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexSQL.o: $(srcdir)/scintilla/src/LexSQL.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexVB.o: $(srcdir)/scintilla/src/LexVB.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LineMarker.o: $(srcdir)/scintilla/src/LineMarker.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_PlatWX.o: $(srcdir)/PlatWX.cpp - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_PropSet.o: $(srcdir)/scintilla/src/PropSet.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_RESearch.o: $(srcdir)/scintilla/src/RESearch.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_ScintillaBase.o: $(srcdir)/scintilla/src/ScintillaBase.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_ScintillaWX.o: $(srcdir)/ScintillaWX.cpp - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_Style.o: $(srcdir)/scintilla/src/Style.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_StyleContext.o: $(srcdir)/scintilla/src/StyleContext.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_UniConversion.o: $(srcdir)/scintilla/src/UniConversion.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_ViewStyle.o: $(srcdir)/scintilla/src/ViewStyle.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_WindowAccessor.o: $(srcdir)/scintilla/src/WindowAccessor.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_XPM.o: $(srcdir)/scintilla/src/XPM.cxx - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_stc.o: $(srcdir)/stc.cpp - $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< uninstall: diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in index 11064e42ce..67bfce2c55 100644 --- a/src/xrc/Makefile.in +++ b/src/xrc/Makefile.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@ @@ -128,10 +124,6 @@ XRCLIB_OBJECTS = \ ### 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) @@ -185,42 +177,42 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_GCC_PCH_1@__xrcdll_PCH_DEP = .pch/wxprec_xrcdll/wx/wxprec.h.gch @COND_GCC_PCH_1@__xrcdll_PCH_INC = -I.pch/wxprec_xrcdll COND_SHARED_1___xrcdll___depname = \ - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) + $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) @COND_SHARED_1@__xrcdll___depname = $(COND_SHARED_1___xrcdll___depname) COND_PLATFORM_WIN32_1___xrcdll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_PLATFORM_WIN32_1@__xrcdll___importlib = $(COND_PLATFORM_WIN32_1___xrcdll___importlib) COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd = -install_name \ - $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) + $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) @COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__xrcdll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ @COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX)) @COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) @COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___xrcdll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) @COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(COND_USE_SOVERLINUX_1___xrcdll___soname_flags) COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) + $(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @@ -251,152 +243,152 @@ all: $(__xrcdll___depname) $(__xrclib___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) + rm -f $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-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_xrcdll___depname) $(__install_xrclib___depname) - $(INSTALL_DIR) $(includedir) + $(INSTALL) -d $(includedir) for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; 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)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) + $(STRIP) $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) @COND_SHARED_1@install_xrcdll: -@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL) -d $(libdir) +@COND_SHARED_1@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(libdir) +@COND_SHARED_1@ install -c $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__xrcdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_xrclib: -@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL) -d $(libdir) +@COND_SHARED_0@ $(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a $(libdir) uninstall: -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(__xrcdll_PCH_DEP) $(XRCDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(__xrcdll_PCH_DEP) $(XRCDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___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_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__xrcdll___so_symlinks_cmd) xrcdll_xh_bmp.o: $(srcdir)/xh_bmp.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_bttn.o: $(srcdir)/xh_bttn.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_cald.o: $(srcdir)/xh_cald.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_chckb.o: $(srcdir)/xh_chckb.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_chckl.o: $(srcdir)/xh_chckl.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_choic.o: $(srcdir)/xh_choic.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_combo.o: $(srcdir)/xh_combo.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_dlg.o: $(srcdir)/xh_dlg.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_frame.o: $(srcdir)/xh_frame.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_gauge.o: $(srcdir)/xh_gauge.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_html.o: $(srcdir)/xh_html.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_listb.o: $(srcdir)/xh_listb.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_listc.o: $(srcdir)/xh_listc.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_menu.o: $(srcdir)/xh_menu.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_notbk.o: $(srcdir)/xh_notbk.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_panel.o: $(srcdir)/xh_panel.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_radbt.o: $(srcdir)/xh_radbt.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_radbx.o: $(srcdir)/xh_radbx.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_scrol.o: $(srcdir)/xh_scrol.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_scwin.o: $(srcdir)/xh_scwin.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_sizer.o: $(srcdir)/xh_sizer.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_slidr.o: $(srcdir)/xh_slidr.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_spin.o: $(srcdir)/xh_spin.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_split.o: $(srcdir)/xh_split.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_stbox.o: $(srcdir)/xh_stbox.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_stlin.o: $(srcdir)/xh_stlin.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_text.o: $(srcdir)/xh_text.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_toolb.o: $(srcdir)/xh_toolb.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_tree.o: $(srcdir)/xh_tree.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xmlres.o: $(srcdir)/xmlres.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< @COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: $(__xrclib_PCH_DEP) $(XRCLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @@ -404,115 +396,115 @@ xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp @COND_SHARED_0@ $(RANLIB) $@ xrclib_xh_bmp.o: $(srcdir)/xh_bmp.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_bttn.o: $(srcdir)/xh_bttn.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_cald.o: $(srcdir)/xh_cald.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_chckb.o: $(srcdir)/xh_chckb.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_chckl.o: $(srcdir)/xh_chckl.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_choic.o: $(srcdir)/xh_choic.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_combo.o: $(srcdir)/xh_combo.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_dlg.o: $(srcdir)/xh_dlg.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_frame.o: $(srcdir)/xh_frame.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_gauge.o: $(srcdir)/xh_gauge.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_html.o: $(srcdir)/xh_html.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_listb.o: $(srcdir)/xh_listb.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_listc.o: $(srcdir)/xh_listc.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_menu.o: $(srcdir)/xh_menu.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_notbk.o: $(srcdir)/xh_notbk.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_panel.o: $(srcdir)/xh_panel.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_radbt.o: $(srcdir)/xh_radbt.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_radbx.o: $(srcdir)/xh_radbx.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_scrol.o: $(srcdir)/xh_scrol.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_scwin.o: $(srcdir)/xh_scwin.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_sizer.o: $(srcdir)/xh_sizer.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_slidr.o: $(srcdir)/xh_slidr.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_spin.o: $(srcdir)/xh_spin.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_split.o: $(srcdir)/xh_split.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_stbox.o: $(srcdir)/xh_stbox.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_stlin.o: $(srcdir)/xh_stlin.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_text.o: $(srcdir)/xh_text.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_toolb.o: $(srcdir)/xh_toolb.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_tree.o: $(srcdir)/xh_tree.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xmlres.o: $(srcdir)/xmlres.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib_xmlrsall.o: $(srcdir)/xmlrsall.cpp - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< # Include dependency info, if present: diff --git a/utils/HelpGen/Makefile.in b/utils/HelpGen/Makefile.in index 64ee29f116..53c3224d79 100644 --- a/utils/HelpGen/Makefile.in +++ b/utils/HelpGen/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ @@ -42,8 +41,6 @@ LIBDIRNAME = $(top_builddir)lib ### Conditionally set variables: ### -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -53,7 +50,7 @@ LIBDIRNAME = $(top_builddir)lib @COND_WXUNIV_1@WXUNIVNAME = univ @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL @COND_PLATFORM_MAC_1@__HelpGen___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL HelpGen$(EXEEXT) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL HelpGen @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ @@ -80,41 +77,41 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ ### Targets: ### -all: HelpGen$(EXEEXT) +all: HelpGen -HelpGen$(EXEEXT): $(HELPGEN_OBJECTS) +HelpGen: $(HELPGEN_OBJECTS) $(CXX) -o $@ $(HELPGEN_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__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) $(__HelpGen___mac_setfilecmd) HelpGen_HelpGen.o: $(srcdir)/src/HelpGen.cpp - $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $< HelpGen_cjparser.o: $(srcdir)/src/cjparser.cpp - $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $< HelpGen_docripper.o: $(srcdir)/src/docripper.cpp - $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $< HelpGen_ifcontext.o: $(srcdir)/src/ifcontext.cpp - $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $< HelpGen_markup.o: $(srcdir)/src/markup.cpp - $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $< HelpGen_scriptbinder.o: $(srcdir)/src/scriptbinder.cpp - $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $< HelpGen_sourcepainter.o: $(srcdir)/src/sourcepainter.cpp - $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $< HelpGen_srcparser.o: $(srcdir)/src/srcparser.cpp - $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $< clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f HelpGen$(EXEEXT) + rm -f HelpGen distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile diff --git a/utils/configtool/src/Makefile.in b/utils/configtool/src/Makefile.in index ec6aedcd8b..10847224b4 100644 --- a/utils/configtool/src/Makefile.in +++ b/utils/configtool/src/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -54,8 +53,6 @@ WXCONFIGTOOL_OBJECTS = \ ### Conditionally set variables: ### -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -85,8 +82,8 @@ WXCONFIGTOOL_OBJECTS = \ @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 wxconfigtool$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o wxconfigtool Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @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) @@ -110,17 +107,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__wxconfigtool___mac_rezcmd = \ @COND_PLATFORM_MAC_1@ $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__wxconfigtool___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxconfigtool$(EXEEXT) +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxconfigtool @COND_PLATFORM_WIN32_1@__wxconfigtool___win32rc = wxconfigtool_sample_rc.o ### Targets: ### -all: wxconfigtool$(EXEEXT) data +all: wxconfigtool data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f wxconfigtool$(EXEEXT) + rm -f wxconfigtool data: @mkdir -p . @@ -139,55 +136,55 @@ install-strip: install uninstall: -wxconfigtool$(EXEEXT): $(WXCONFIGTOOL_OBJECTS) $(__wxconfigtool___win32rc) +wxconfigtool: $(WXCONFIGTOOL_OBJECTS) $(__wxconfigtool___win32rc) $(CXX) -o $@ $(WXCONFIGTOOL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(__WXLIB_ADV_p) $(__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) $(__wxconfigtool___mac_rezcmd) $(__wxconfigtool___mac_setfilecmd) wxconfigtool_appsettings.o: $(srcdir)/appsettings.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< wxconfigtool_configitem.o: $(srcdir)/configitem.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< wxconfigtool_configitemselector.o: $(srcdir)/configitemselector.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< wxconfigtool_configtooldoc.o: $(srcdir)/configtooldoc.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< wxconfigtool_configtoolview.o: $(srcdir)/configtoolview.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< wxconfigtool_configtree.o: $(srcdir)/configtree.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< wxconfigtool_custompropertydialog.o: $(srcdir)/custompropertydialog.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< wxconfigtool_htmlparser.o: $(srcdir)/htmlparser.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< wxconfigtool_mainframe.o: $(srcdir)/mainframe.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< wxconfigtool_propeditor.o: $(srcdir)/propeditor.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< wxconfigtool_property.o: $(srcdir)/property.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< wxconfigtool_sample_rc.o: $(srcdir)/../../../samples/sample.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 wxconfigtool_settingsdialog.o: $(srcdir)/settingsdialog.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< wxconfigtool_utils.o: $(srcdir)/utils.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< wxconfigtool_wxconfigtool.o: $(srcdir)/wxconfigtool.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< # Include dependency info, if present: diff --git a/utils/emulator/src/Makefile.in b/utils/emulator/src/Makefile.in index 2710afcdb1..b9a80d5728 100644 --- a/utils/emulator/src/Makefile.in +++ b/utils/emulator/src/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -41,8 +40,6 @@ WXEMULATOR_OBJECTS = \ ### Conditionally set variables: ### -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -72,8 +69,8 @@ WXEMULATOR_OBJECTS = \ @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 wxemulator$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o wxemulator Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) @@ -88,17 +85,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__wxemulator___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__wxemulator___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxemulator$(EXEEXT) +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxemulator @COND_PLATFORM_WIN32_1@__wxemulator___win32rc = wxemulator_sample_rc.o ### Targets: ### -all: wxemulator$(EXEEXT) data +all: wxemulator data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f wxemulator$(EXEEXT) + rm -f wxemulator data: @mkdir -p . @@ -117,13 +114,13 @@ install-strip: install uninstall: -wxemulator$(EXEEXT): $(WXEMULATOR_OBJECTS) $(__wxemulator___win32rc) +wxemulator: $(WXEMULATOR_OBJECTS) $(__wxemulator___win32rc) $(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(__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) $(__wxemulator___mac_rezcmd) $(__wxemulator___mac_setfilecmd) wxemulator_emulator.o: $(srcdir)/emulator.cpp - $(CXXC) -c -o $@ $(WXEMULATOR_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXEMULATOR_CXXFLAGS) $< wxemulator_sample_rc.o: $(srcdir)/../../../samples/sample.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 diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in index e745908bb9..3c8a7f9f41 100644 --- a/utils/helpview/src/Makefile.in +++ b/utils/helpview/src/Makefile.in @@ -13,12 +13,9 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ -INSTALL_DIR = @INSTALL_DIR@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ @@ -45,8 +42,6 @@ LIBDIRNAME = $(top_builddir)lib ### Conditionally set variables: ### -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,7 +71,7 @@ LIBDIRNAME = $(top_builddir)lib @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 helpview$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o helpview Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -94,18 +89,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__helpview___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__helpview___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C helpview$(EXEEXT) +@COND_PLATFORM_MAC_1@__helpview___mac_setfilecmd = $(SETFILE) -a C helpview @COND_PLATFORM_WIN32_1@__helpview___win32rc = helpview_helpview_rc.o ### Targets: ### -all: helpview$(EXEEXT) data +all: helpview data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f helpview$(EXEEXT) + rm -f helpview data: @mkdir -p . @@ -118,13 +112,13 @@ data: distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc) +helpview: $(HELPVIEW_OBJECTS) $(__helpview___win32rc) $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(__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) $(__helpview___mac_rezcmd) $(__helpview___mac_setfilecmd) helpview_helpview.o: $(srcdir)/helpview.cpp - $(CXXC) -c -o $@ $(HELPVIEW_CXXFLAGS) $< + $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $< helpview_helpview_rc.o: $(srcdir)/helpview.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 @@ -132,11 +126,11 @@ helpview_helpview_rc.o: $(srcdir)/helpview.rc install: all install_helpview install-strip: install - $(STRIP) $(bindir)/helpview$(EXEEXT) + $(STRIP) $(bindir)/helpview install_helpview: - $(INSTALL_DIR) $(bindir) - $(INSTALL_PROGRAM) helpview$(EXEEXT) $(bindir) + $(INSTALL) -d $(bindir) + install -c helpview $(bindir) uninstall: diff --git a/utils/tex2rtf/src/Makefile.in b/utils/tex2rtf/src/Makefile.in index 2eddabcd09..56415e1b6c 100644 --- a/utils/tex2rtf/src/Makefile.in +++ b/utils/tex2rtf/src/Makefile.in @@ -13,12 +13,9 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ -INSTALL_DIR = @INSTALL_DIR@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ @@ -63,8 +60,6 @@ TEX2RTF_OBJECTS = \ ### Conditionally set variables: ### -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -94,8 +89,8 @@ TEX2RTF_OBJECTS = \ @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_4) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_4) -i $(srcdir)/../../../samples -o tex2rtf_gui$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(__DLLFLAG_p_4) -i $(srcdir)/../../../samples -o tex2rtf_gui Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) @@ -112,21 +107,21 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_4 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_5 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__tex2rtf___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL tex2rtf$(EXEEXT) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL tex2rtf @COND_PLATFORM_MAC_1@__tex2rtf_gui___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__tex2rtf_gui___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C tex2rtf_gui$(EXEEXT) +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C tex2rtf_gui @COND_PLATFORM_WIN32_1@__tex2rtf_gui___win32rc = tex2rtf_gui_sample_rc.o ### Targets: ### -all: tex2rtf$(EXEEXT) tex2rtf_gui$(EXEEXT) +all: tex2rtf tex2rtf_gui clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f tex2rtf$(EXEEXT) - rm -f tex2rtf_gui$(EXEEXT) + rm -f tex2rtf + rm -f tex2rtf_gui distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @@ -134,77 +129,77 @@ distclean: clean install: all install_tex2rtf install_tex2rtf_gui install-strip: install - $(STRIP) $(bindir)/tex2rtf$(EXEEXT) - $(STRIP) $(bindir)/tex2rtf_gui$(EXEEXT) + $(STRIP) $(bindir)/tex2rtf + $(STRIP) $(bindir)/tex2rtf_gui install_tex2rtf: - $(INSTALL_DIR) $(bindir) - $(INSTALL_PROGRAM) tex2rtf$(EXEEXT) $(bindir) + $(INSTALL) -d $(bindir) + install -c tex2rtf $(bindir) install_tex2rtf_gui: - $(INSTALL_DIR) $(bindir) - $(INSTALL_PROGRAM) tex2rtf_gui$(EXEEXT) $(bindir) + $(INSTALL) -d $(bindir) + install -c tex2rtf_gui $(bindir) -tex2rtf$(EXEEXT): $(TEX2RTF_OBJECTS) +tex2rtf: $(TEX2RTF_OBJECTS) $(CXX) -o $@ $(TEX2RTF_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__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) $(__tex2rtf___mac_setfilecmd) -tex2rtf_gui$(EXEEXT): $(TEX2RTF_GUI_OBJECTS) $(__tex2rtf_gui___win32rc) +tex2rtf_gui: $(TEX2RTF_GUI_OBJECTS) $(__tex2rtf_gui___win32rc) $(CXX) -o $@ $(TEX2RTF_GUI_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(__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) $(__tex2rtf_gui___mac_rezcmd) $(__tex2rtf_gui___mac_setfilecmd) tex2rtf_gui_htmlutil.o: $(srcdir)/htmlutil.cpp - $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< tex2rtf_gui_readshg.o: $(srcdir)/readshg.cpp - $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< tex2rtf_gui_rtfutils.o: $(srcdir)/rtfutils.cpp - $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< tex2rtf_gui_sample_rc.o: $(srcdir)/../../../samples/sample.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir $(srcdir)/../../../samples tex2rtf_gui_table.o: $(srcdir)/table.cpp - $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< tex2rtf_gui_tex2any.o: $(srcdir)/tex2any.cpp - $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< tex2rtf_gui_tex2rtf.o: $(srcdir)/tex2rtf.cpp - $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< tex2rtf_gui_texutils.o: $(srcdir)/texutils.cpp - $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< tex2rtf_gui_xlputils.o: $(srcdir)/xlputils.cpp - $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< tex2rtf_htmlutil.o: $(srcdir)/htmlutil.cpp - $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $< tex2rtf_readshg.o: $(srcdir)/readshg.cpp - $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $< tex2rtf_rtfutils.o: $(srcdir)/rtfutils.cpp - $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $< tex2rtf_table.o: $(srcdir)/table.cpp - $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $< tex2rtf_tex2any.o: $(srcdir)/tex2any.cpp - $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $< tex2rtf_tex2rtf.o: $(srcdir)/tex2rtf.cpp - $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $< tex2rtf_texutils.o: $(srcdir)/texutils.cpp - $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $< tex2rtf_xlputils.o: $(srcdir)/xlputils.cpp - $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $< + $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $< uninstall: diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in index 4361c44cdc..542a5259cb 100644 --- a/utils/wxrc/Makefile.in +++ b/utils/wxrc/Makefile.in @@ -13,13 +13,10 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_XML = @EXTRALIBS_XML@ HOST_SUFFIX = @HOST_SUFFIX@ -INSTALL_DIR = @INSTALL_DIR@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ LDFLAGS = @LDFLAGS@ SETFILE = @SETFILE@ STRIP = @STRIP@ @@ -41,8 +38,6 @@ WXRC_OBJECTS = \ ### Conditionally set variables: ### -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -76,17 +71,16 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_MONOLITHIC_0@__WXLIB_XML_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_PLATFORM_MAC_1@__wxrc___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxrc$(EXEEXT) +@COND_PLATFORM_MAC_1@__wxrc___mac_setfilecmd = $(SETFILE) -t APPL wxrc ### Targets: ### -all: wxrc$(EXEEXT) +all: wxrc clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f wxrc$(EXEEXT) + rm -f wxrc distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @@ -94,21 +88,21 @@ distclean: clean install: all install_wxrc install-strip: install - $(STRIP) $(bindir)/wxrc$(EXEEXT) + $(STRIP) $(bindir)/wxrc install_wxrc: - $(INSTALL_DIR) $(bindir) - $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(bindir) + $(INSTALL) -d $(bindir) + install -c wxrc $(bindir) uninstall: -wxrc$(EXEEXT): $(WXRC_OBJECTS) +wxrc: $(WXRC_OBJECTS) $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(EXTRALIBS_XML) $(__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) $(__wxrc___mac_setfilecmd) wxrc_wxrc.o: $(srcdir)/wxrc.cpp - $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $< + $(CXX) -c -o $@ $(WXRC_CXXFLAGS) $< # Include dependency info, if present: -- 2.45.2