From: Václav Slavík Date: Tue, 24 Jun 2003 22:35:14 +0000 (+0000) Subject: no longer needed X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4136b40acca972cf023cab818bc5c5544a8c0a21 no longer needed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/make.env.in b/src/make.env.in deleted file mode 100644 index 0604cbca52..0000000000 --- a/src/make.env.in +++ /dev/null @@ -1,85 +0,0 @@ -# -# File: make.env -# Author: Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee -# Created: 1993 -# Updated: 2001 -# Copyright:, -# Copyright:(c) 1999, Vadim Zeitlin -# Copyright:(c) 1999, Robert Roebling -# Copyright:(c) 2001, Ron Lee -# - -####################### GENERAL SETTINGS ############################ - -# see comment near LDFLAGS at the end of file -EXTRALIBS = @LDFLAGS@ @LDFLAGS_VERSIONING@ @LIBS@ @DMALLOC_LIBS@ -OPENGLLIBS = @OPENGL_LIBS@ -LDFLAGS_GL = @LDFLAGS_GL@ -LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS} - -TOOLKIT = @TOOLKIT@ -TOOLKITDIR = @TOOLKIT_DIR@ - -WXLIB = @WX_LIBRARY_NAME_STATIC@ -WXSHLIB = @WX_LIBRARY_NAME_SHARED@ -WXLIBBASE = @WX_LIBRARY_BASENAME@ - -########################### VERSION ################################# - -WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@ -WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@ -WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@ - -########################### Programs ################################# - -CXX = @CXX@ -CC = @CC@ - -# Compiler for lex/yacc .c programs -CCLEX = @CC@ - -LEX = @LEX@ -YACC = @YACC@ -AR = @AR@ -AS = @AS@ -NM = @NM@ -LN_S = @LN_S@ -STRIP = @STRIP@ -AROPTIONS = rcu -RANLIB = @RANLIB@ -LD = @LD@ -MAKEINFO = @MAKEINFO@ -RM = rm -f - -SHARED_LD = @SHARED_LD@ - -RESFLAGS = @RESFLAGS@ -RESCOMP = @RESCOMP@ - -DEREZ = @DEREZ@ - -SETFILE = @SETFILE@ - -DLLTOOL = @DLLTOOL@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL@ - -########################### Flags ################################# - -CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLCHAIN_DEFS@@TOOLCHAIN_DLL_DEFS@ @WXDEBUG_DEFINE@ -CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS}@CODE_GEN_FLAGS@ @CFLAGS@ -CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS}@CODE_GEN_FLAGS@@CODE_GEN_FLAGS_CXX@ @CXXFLAGS@ -PICFLAGS = @PIC_FLAG@ - -# taking into account how SHARED_LD is defined, appending LDFLAGS to it -# doesn't work, so we put them in the end of the linker command line in -# EXTRALIBS instead (see above) -# LDFLAGS = @LDFLAGS@ - -# specific linker flags for when building executables since there -# Mac OS X requires specific linker flags for executables linked -# against dynamic shared libraries -LDFLAGS_EXE = @LDFLAGS_EXE@ diff --git a/src/makelib.env.in b/src/makelib.env.in deleted file mode 100644 index daf3f6b710..0000000000 --- a/src/makelib.env.in +++ /dev/null @@ -1,125 +0,0 @@ -# -# Template makefile for building wxWindows companion libraries. -# -# Author: Ron Lee -# Created: 19/3/2000 -# $Id$ -# -# To use, set the following vars before including it: -# -# top_srcdir -# top_builddir -# libsrc_dir -# -# TARGET_LIBNAME -# LIBVERSION_CURRENT -# LIBVERSION_REVISION -# LIBVERSION_AGE -# HEADER_PATH -# HEADER_SUBDIR -# -# HEADERS -# OBJECTS -# -# either a shared or static lib will be built according to the -# option given to configure. -# - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -includedir = @includedir@ -libdir = @libdir@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ - -TARGETLIB_STATIC = $(TARGET_LIBNAME).a -TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE) -TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) -TARGETLIB_LINK2 = $(TARGET_LIBNAME).so - -TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@ - -LDFLAGS_VERSIONING = @LDFLAGS_VERSIONING@ - -# NB: see remark in Makefile.in as to why we don't use %.foo: %.bar rules -.SUFFIXES: .o .c .cpp .cxx - -.c.o: - $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $< - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $< - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $< - -# the comment at the end of the next line is needed because otherwise autoconf -# would remove this line completely - it contains a built-in hack to remove -# any VPATH assignment not containing ':' -VPATH = @PATH_IFS@$(top_srcdir)/$(libsrc_dir) # ':' for autoconf - -include $(top_builddir)/src/make.env - -all: libtype_@WX_TARGET_LIBRARY_TYPE@ - -libtype_so: $(top_builddir)/lib/$(TARGETLIB_SHARED) - -libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC) - -$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS) - @$(INSTALL) -d $(top_builddir)/lib - $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) $(LDFLAGS_VERSIONING) - cd $(top_builddir)/lib \ - && $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \ - && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \ - && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2) - -$(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS) - @$(INSTALL) -d $(top_builddir)/lib - @$(RM) $@ - $(AR) $(AROPTIONS) $@ $(OBJECTS) - $(RANLIB) $@ - -install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers - -install_so: - $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED) - @$(RM) $(libdir)/$(TARGETLIB_LINK1) $(libdir)/$(TARGETLIB_LINK2) - cd $(libdir) \ - && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \ - && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2) - -install_a: - $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC) - -install_headers: - $(INSTALL) -d $(includedir)/wx/$(HEADER_SUBDIR) - @for h in $(HEADERS); do \ - $(INSTALL_DATA) $(HEADER_PATH)/$(HEADER_SUBDIR)/$$h $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \ - echo "installing $(includedir)/wx/$(HEADER_SUBDIR)/$$h"; \ - done - -uninstall: - $(RM) $(libdir)/$(TARGETLIB_STATIC) - $(RM) $(libdir)/$(TARGETLIB_SHARED) - $(RM) $(libdir)/$(TARGETLIB_LINK1) - $(RM) $(libdir)/$(TARGETLIB_LINK2) - @echo "removing headers" - @for h in $(HEADERS); do \ - $(RM) $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \ - done - @if test -d $(includedir)/wx/$(HEADER_SUBDIR); then \ - rmdir $(includedir)/wx/$(HEADER_SUBDIR); \ - fi - @-rmdir $(includedir)/wx - -clean: - $(RM) $(OBJECTS) $(top_builddir)/lib/$(TARGETLIB_SHARED) \ - $(top_builddir)/lib/$(TARGETLIB_LINK1) \ - $(top_builddir)/lib/$(TARGETLIB_LINK2) \ - $(top_builddir)/lib/$(TARGETLIB_STATIC) core - -.PHONY: all libtype_so libtype_a install install_so install_a install_headers uninstall clean - diff --git a/src/makeprog.env.in b/src/makeprog.env.in deleted file mode 100644 index f8f61f00cb..0000000000 --- a/src/makeprog.env.in +++ /dev/null @@ -1,80 +0,0 @@ -# Make environment for making samples on Unix - -# The binary program extension, if any, including dots (e.g. '.exe') -PROGRAM_EXT = @PROGRAM_EXT@ -BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT) -RES_PROGRAM_OBJ = @RESPROGRAMOBJ@ -BUNDLE = $(BIN_PROGRAM).app/Contents - -# NB: see remark in Makefile.in as to why we don't use %.foo: %.bar rules -.SUFFIXES: .o .c .cpp .cxx .rc _resources.o - -.c.o: - $(CC) -c $(CFLAGS) $(APPEXTRADEFS) -o $@ $< - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< - -.rc_resources.o: - $(RESCOMP) -i $< -o $@ $(RESFLAGS) - - -# the comment at the end of the next line is needed because otherwise autoconf -# would remove this line completely - it contains a built-in hack to remove -# any VPATH assignment not containing ':' -VPATH = @PATH_IFS@$(top_srcdir)/$(program_dir) # ':' for autoconf - -# Set defaults from configure -include $(top_builddir)/src/make.env - -all: $(BIN_PROGRAM) @MACOSX_BUNDLE@ install_dirs install_data - -$(BIN_PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OBJ) @LIBWXMACRES@ - $(CXX) $(LDFLAGS_EXE) -o $@ $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OBJ) - @MACRESCOMP@ $(BIN_PROGRAM) $(RESOPTIONS) - @MACSETFILE@ $(SETOPTIONS) $(BIN_PROGRAM) - -install_dirs: - @list='$(DATADIRS)'; for p in $$list; do \ - mkdir -p $(top_builddir)/$(program_dir)/$$p; \ - done - -install_data: - @list='$(DATAFILES)'; for p in $$list; do \ - if test ! -s $(top_builddir)/$(program_dir)/$$p; then \ - cp -pRf $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \ - fi; \ - done - -clean: - rm -f $(OBJECTS) $(DEPFILES) $(BIN_PROGRAM) $(RES_PROGRAM_OBJ) core - -# -# Targets to build a Mac OS X application bundle -# -bundle: $(BUNDLE)/MacOS/$(PROGRAM) $(BUNDLE)/Info.plist $(BUNDLE)/PkgInfo $(BUNDLE)/Resources/$(PROGRAM).rsrc $(BUNDLE)/Resources/wxmac.icns - -$(BUNDLE)/Info.plist: $(top_srcdir)/src/$(TOOLKITDIR)/Info.plist.in $(top_builddir)/lib/@WX_TARGET_LIBRARY@ - @$(INSTALL) -d `dirname $@` - sed -e "s/IDENTIFIER/`echo $(program_dir) | sed 's,/,.,g'`/" \ - -e "s/EXECUTABLE/$(PROGRAM)/" \ - -e "s/VERSION/$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)/" $< > $@ - -$(BUNDLE)/PkgInfo: - @$(INSTALL) -d `dirname $@` - echo -n "APPL????" > $@ - -$(BUNDLE)/MacOS/$(PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ - @$(INSTALL) -d `dirname $@` - $(CXX) $(LDFLAGS_EXE) -o $@ $(OBJECTS) $(LDLIBS) $(LIBRARIES) - -$(BUNDLE)/Resources/$(PROGRAM).rsrc: $(top_builddir)/lib/@WX_RESOURCES_MACOSX_DATA@ - @$(INSTALL) -d `dirname $@` - cp $< $@ - -$(BUNDLE)/Resources/wxmac.icns: $(top_srcdir)/src/$(TOOLKITDIR)/wxmac.icns - @$(INSTALL) -d `dirname $@` - cp $< $@