From f1e938e09c00db5204393a598df2ee13d521b758 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Wed, 3 Sep 2003 17:34:00 +0000 Subject: [PATCH] Added missing bakefiles in utils/* and regenerated (autoconf) Makefile.in. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/HelpGen/src/Makefile.in | 154 +++++++++++++++++++++++++++++++++------ utils/HelpGen/src/helpgen.bkl | 23 ++++++ utils/hhp2cached/Makefile.in | 156 +++++++++++++++++++++++++++++++++++----- utils/hhp2cached/hhp2cached.bkl | 25 +++++++ 4 files changed, 319 insertions(+), 39 deletions(-) rewrite utils/HelpGen/src/Makefile.in (99%) create mode 100644 utils/HelpGen/src/helpgen.bkl rewrite utils/hhp2cached/Makefile.in (97%) create mode 100644 utils/hhp2cached/hhp2cached.bkl diff --git a/utils/HelpGen/src/Makefile.in b/utils/HelpGen/src/Makefile.in dissimilarity index 99% index ae2b0f3..64ee29f 100644 --- a/utils/HelpGen/src/Makefile.in +++ b/utils/HelpGen/src/Makefile.in @@ -1,22 +1,132 @@ -# -# File: makefile.unx -# Author: Vadim Zeitlin -# Created: 1998 -# Updated: - -top_srcdir = @top_srcdir@/.. -top_builddir = ../../.. -program_dir = utils/HelpGen/src - -PROGRAM=HelpGen - -OBJECTS = HelpGen.o cjparser.o docripper.o ifcontext.o markup.o \ - scriptbinder.o sourcepainter.o srcparser.o \ - wx_extra_imps.o -DEPFILES= HelpGen.d cjparser.d docripper.d ifcontext.d markup.d \ - scriptbinder.d sourcepainter.d srcparser.d \ - wx_extra_imps.d - -include ../../../src/makeprog.env - --include $(DEPFILES) +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + + +@MAKE_SET@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +INSTALL = @INSTALL@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ +EXEEXT = @EXEEXT@ +EXTRALIBS = @EXTRALIBS@ +HOST_SUFFIX = @HOST_SUFFIX@ +LDFLAGS = @LDFLAGS@ +SETFILE = @SETFILE@ +TOOLKIT = @TOOLKIT@ +TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ +TOOLKIT_VERSION = @TOOLKIT_VERSION@ +srcdir = @srcdir@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +### Variables: ### + +HELPGEN_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +HELPGEN_OBJECTS = \ + HelpGen_HelpGen.o \ + HelpGen_cjparser.o \ + HelpGen_docripper.o \ + HelpGen_ifcontext.o \ + HelpGen_markup.o \ + HelpGen_scriptbinder.o \ + HelpGen_sourcepainter.o \ + HelpGen_srcparser.o +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 +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d +@COND_UNICODE_1@WXUNICODEFLAG = u +@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_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ +@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ + +### Targets: ### + +all: HelpGen$(EXEEXT) + +HelpGen$(EXEEXT): $(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) $< + +HelpGen_cjparser.o: $(srcdir)/src/cjparser.cpp + $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $< + +HelpGen_docripper.o: $(srcdir)/src/docripper.cpp + $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $< + +HelpGen_ifcontext.o: $(srcdir)/src/ifcontext.cpp + $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $< + +HelpGen_markup.o: $(srcdir)/src/markup.cpp + $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $< + +HelpGen_scriptbinder.o: $(srcdir)/src/scriptbinder.cpp + $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $< + +HelpGen_sourcepainter.o: $(srcdir)/src/sourcepainter.cpp + $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $< + +HelpGen_srcparser.o: $(srcdir)/src/srcparser.cpp + $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $< + +clean: + rm -rf ./.deps ./.pch + rm -f ./*.o + rm -f HelpGen$(EXEEXT) + +distclean: clean + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile + +install: all + +install-strip: install + +uninstall: + + +# Include dependency info, if present: +@IF_GNU_MAKE@-include .deps/*.d + +.PHONY: all clean distclean install uninstall diff --git a/utils/HelpGen/src/helpgen.bkl b/utils/HelpGen/src/helpgen.bkl new file mode 100644 index 0000000..7959efd --- /dev/null +++ b/utils/HelpGen/src/helpgen.bkl @@ -0,0 +1,23 @@ + + + + + + + + + + src/HelpGen.cpp + src/cjparser.cpp + src/docripper.cpp + src/ifcontext.cpp + src/markup.cpp + src/scriptbinder.cpp + src/sourcepainter.cpp + src/srcparser.cpp + + base + + + diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in dissimilarity index 97% index 38cef34..32732ba 100644 --- a/utils/hhp2cached/Makefile.in +++ b/utils/hhp2cached/Makefile.in @@ -1,17 +1,139 @@ -# Purpose: makefile for hhp2cached (UNIX). -# Created: 2000-01-19 - -top_srcdir = @top_srcdir@/.. -top_builddir = ../.. -program_dir = utils/hhp2cached - -PROGRAM=hhp2cached - - -OBJECTS=$(PROGRAM).o -DEPFILES=$(PROGRAM).d - -include ../../src/makeprog.env - --include $(DEPFILES) - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + + +@MAKE_SET@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +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@ +SETFILE = @SETFILE@ +STRIP = @STRIP@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ +TOOLKIT = @TOOLKIT@ +TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ +TOOLKIT_VERSION = @TOOLKIT_VERSION@ +bindir = @bindir@ +srcdir = @srcdir@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +### Variables: ### + +HHP2CACHED_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ + -I$(srcdir)/../../samples $(CXXFLAGS) +HHP2CACHED_OBJECTS = \ + hhp2cached_hhp2cached.o \ + $(__hhp2cached___win32rc) +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 +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@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 \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o hhp2cached$(EXEEXT) 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) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_0___WXLIB_HTML_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@__hhp2cached___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@__hhp2cached___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C hhp2cached$(EXEEXT) +@COND_PLATFORM_WIN32_1@__hhp2cached___win32rc = hhp2cached_hhp2cached_rc.o + +### Targets: ### + +all: hhp2cached$(EXEEXT) + +clean: + rm -rf ./.deps ./.pch + rm -f ./*.o + rm -f hhp2cached$(EXEEXT) + +distclean: clean + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile + +hhp2cached$(EXEEXT): $(HHP2CACHED_OBJECTS) $(__hhp2cached___win32rc) + $(CXX) -o $@ $(HHP2CACHED_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) + $(__hhp2cached___mac_rezcmd) + $(__hhp2cached___mac_setfilecmd) + +hhp2cached_hhp2cached.o: $(srcdir)/hhp2cached.cpp + $(CXXC) -c -o $@ $(HHP2CACHED_CXXFLAGS) $< + +hhp2cached_hhp2cached_rc.o: $(srcdir)/hhp2cached.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 + +install: all install_hhp2cached + +install-strip: install + $(STRIP) $(bindir)/hhp2cached$(EXEEXT) + +install_hhp2cached: + $(INSTALL_DIR) $(bindir) + $(INSTALL_PROGRAM) hhp2cached$(EXEEXT) $(bindir) + +uninstall: + + +# Include dependency info, if present: +@IF_GNU_MAKE@-include .deps/*.d + +.PHONY: all clean distclean install install_hhp2cached uninstall diff --git a/utils/hhp2cached/hhp2cached.bkl b/utils/hhp2cached/hhp2cached.bkl new file mode 100644 index 0000000..388ecbd --- /dev/null +++ b/utils/hhp2cached/hhp2cached.bkl @@ -0,0 +1,25 @@ + + + + + + + + + + hhp2cached.cpp + + hhp2cached.rc + html + core + base + $(BINDIR) + + + + + -- 2.7.4