regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained 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:
|
||||
|
||||
|
Reference in New Issue
Block a user