mirror of
https://git.savannah.gnu.org/git/gperf.git
synced 2025-12-02 13:09:22 +00:00
Remove old infrastructure for building with MSVC.
This commit is contained in:
Bruno Haible
11
ChangeLog
11
ChangeLog
@@ -1,3 +1,14 @@
|
||||
2012-07-01 Bruno Haible <bruno@clisp.org>
|
||||
|
||||
Remove old infrastructure for building with MSVC.
|
||||
* autogen.sh: Don't remove src/config.h.msvc.
|
||||
* Makefile.devel (src/config.h.msvc): Remove rule.
|
||||
(all): Don't depend on it.
|
||||
* src/Makefile.in (GENERATED_FILES): Remove config.h.msvc.
|
||||
* src/.gitignore: Remove config.h.msvc.
|
||||
* Makefile.msvc: Remove file.
|
||||
* Makefile.in (SOURCE_FILES): Remove Makefile.msvc.
|
||||
|
||||
2012-07-01 Bruno Haible <bruno@clisp.org>
|
||||
|
||||
Support for building with MSVC much like for Unix.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
SHELL = /bin/sh
|
||||
MAKE = make
|
||||
|
||||
all : configures src/config.h.in src/config.h.msvc src/config.h_vms
|
||||
all : configures src/config.h.in src/config.h_vms
|
||||
|
||||
CONFIGURES = configure lib/configure src/configure tests/configure doc/configure
|
||||
|
||||
@@ -31,9 +31,6 @@ check-configures : $(CONFIGURES)
|
||||
src/config.h.in : src/configure.ac aclocal.m4
|
||||
cd src && autoheader -I ..
|
||||
|
||||
src/config.h.msvc : src/config.h.in
|
||||
cp src/config.h.in src/config.h.msvc
|
||||
|
||||
src/config.h_vms : src/config.h.in
|
||||
cp src/config.h.in src/config.h_vms
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ maintainer-clean : force
|
||||
# List of source files.
|
||||
SOURCE_FILES = \
|
||||
README README.woe32 README.vms NEWS AUTHORS \
|
||||
configure.ac aclocal.m4 Makefile.in Makefile.msvc Makefile.vms \
|
||||
configure.ac aclocal.m4 Makefile.in Makefile.vms \
|
||||
Makefile.devel ChangeLog
|
||||
# List of distributed files imported from other packages.
|
||||
IMPORTED_FILES = \
|
||||
|
||||
198
Makefile.msvc
198
Makefile.msvc
@@ -1,198 +0,0 @@
|
||||
# -*- Makefile -*- for gperf
|
||||
|
||||
# Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
# Written by Bruno Haible <bruno@clisp.org>.
|
||||
#
|
||||
# This file is part of GNU GPERF.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#### Start of system configuration section. ####
|
||||
|
||||
# Flags that can be set on the nmake command line:
|
||||
# MFLAGS={-ML|-MT|-MD} for defining the compilation model
|
||||
# MFLAGS=-ML (the default) Single-threaded, statically linked - libc.lib
|
||||
# MFLAGS=-MT Multi-threaded, statically linked - libcmt.lib
|
||||
# MFLAGS=-MD Multi-threaded, dynamically linked - msvcrt.lib
|
||||
# DEBUG=1 for compiling with debugging information
|
||||
!if !defined(DEBUG)
|
||||
DEBUG=0
|
||||
!endif
|
||||
!if !defined(MFLAGS)
|
||||
MFLAGS=
|
||||
!endif
|
||||
|
||||
# Directories used by "make":
|
||||
srcdir = .
|
||||
|
||||
# Directories used by "make install":
|
||||
prefix = c:\usr
|
||||
exec_prefix = $(prefix)
|
||||
datadir = $(prefix)\share
|
||||
bindir = $(exec_prefix)\bin
|
||||
mandir = $(datadir)\man
|
||||
man1dir = $(mandir)\man1
|
||||
docdir = $(datadir)\doc\gperf
|
||||
|
||||
# Programs used by "make":
|
||||
|
||||
CC = cl
|
||||
CXX = cl -TP
|
||||
|
||||
# Set to -W3 if you want to see maximum amount of warnings, including stupid
|
||||
# ones. Set to -W1 to avoid warnings about signed/unsigned combinations.
|
||||
WARN_CFLAGS = -W1
|
||||
|
||||
!if $(DEBUG)
|
||||
OPTIMFLAGS = -Od -Z7
|
||||
DEBUGFLAGS = -Z7
|
||||
!else
|
||||
# Some people prefer -O2 -G6 instead of -O1, but -O2 is not reliable in MSVC5.
|
||||
OPTIMFLAGS = -D_NDEBUG -O1
|
||||
DEBUGFLAGS =
|
||||
!endif
|
||||
|
||||
CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS)
|
||||
CXXFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS)
|
||||
|
||||
INCLUDES = -Ilib -Isrc
|
||||
|
||||
LN = copy
|
||||
RM = -del
|
||||
|
||||
# Programs used by "make install":
|
||||
INSTALL = copy
|
||||
INSTALL_PROGRAM = copy
|
||||
INSTALL_DATA = copy
|
||||
|
||||
#### End of system configuration section. ####
|
||||
|
||||
SHELL = /bin/sh
|
||||
|
||||
LIB_OBJECTS = lib\getopt.obj lib\getopt1.obj lib\getline.obj lib\hash.obj
|
||||
SRC_OBJECTS = src\version.obj src\positions.obj src\options.obj src\keyword.obj src\keyword-list.obj src\input.obj src\bool-array.obj src\hash-table.obj src\search.obj src\output.obj src\main.obj
|
||||
OBJECTS = $(LIB_OBJECTS) $(SRC_OBJECTS)
|
||||
|
||||
all : gperf.exe
|
||||
|
||||
src\config.h : src\config.h.msvc
|
||||
-$(RM) src\config.h
|
||||
$(LN) src\config.h.msvc src\config.h
|
||||
|
||||
lib\getopt.obj : lib\getopt.c
|
||||
$(CC) $(INCLUDES) $(CFLAGS) -c lib\getopt.c -Folib\getopt.obj
|
||||
|
||||
lib\getopt1.obj : lib\getopt1.c
|
||||
$(CC) $(INCLUDES) $(CFLAGS) -c lib\getopt1.c -Folib\getopt1.obj
|
||||
|
||||
lib\getline.obj : lib\getline.cc
|
||||
$(CXX) $(INCLUDES) $(CXXFLAGS) -c lib\getline.cc -Folib\getline.obj
|
||||
|
||||
lib\hash.obj : lib\hash.cc
|
||||
$(CXX) $(INCLUDES) $(CXXFLAGS) -c lib\hash.cc -Folib\hash.obj
|
||||
|
||||
# Dependencies.
|
||||
CONFIG_H = src\config.h
|
||||
VERSION_H = src\version.h
|
||||
POSITIONS_H = src\positions.h src\positions.icc
|
||||
OPTIONS_H = src\options.h src\options.icc $(POSITIONS_H)
|
||||
KEYWORD_H = src\keyword.h src\keyword.icc
|
||||
KEYWORD_LIST_H = src\keyword-list.h src\keyword-list.icc $(KEYWORD_H)
|
||||
INPUT_H = src\input.h $(KEYWORD_LIST_H)
|
||||
BOOL_ARRAY_H = src\bool-array.h src\bool-array.icc $(OPTIONS_H)
|
||||
HASH_TABLE_H = src\hash-table.h $(KEYWORD_H)
|
||||
SEARCH_H = src\search.h $(KEYWORD_LIST_H) $(POSITIONS_H) $(BOOL_ARRAY_H)
|
||||
OUTPUT_H = src\output.h $(KEYWORD_LIST_H) $(POSITIONS_H)
|
||||
|
||||
src\version.obj : src\version.cc $(VERSION_H)
|
||||
$(CXX) $(INCLUDES) $(CXXFLAGS) -c src\version.cc -Fosrc\version.obj
|
||||
|
||||
src\positions.obj : src\positions.cc $(POSITIONS_H)
|
||||
$(CXX) $(INCLUDES) $(CXXFLAGS) -c src\positions.cc -Fosrc\positions.obj
|
||||
|
||||
src\options.obj : src\options.cc $(OPTIONS_H) $(VERSION_H)
|
||||
$(CXX) $(INCLUDES) $(CXXFLAGS) -c src\options.cc -Fosrc\options.obj
|
||||
|
||||
src\keyword.obj : src\keyword.cc $(KEYWORD_H) $(POSITIONS_H)
|
||||
$(CXX) $(INCLUDES) $(CXXFLAGS) -c src\keyword.cc -Fosrc\keyword.obj
|
||||
|
||||
src\keyword-list.obj : src\keyword-list.cc $(KEYWORD_LIST_H)
|
||||
$(CXX) $(INCLUDES) $(CXXFLAGS) -c src\keyword-list.cc -Fosrc\keyword-list.obj
|
||||
|
||||
src\input.obj : src\input.cc $(INPUT_H) $(OPTIONS_H)
|
||||
$(CXX) $(INCLUDES) $(CXXFLAGS) -c src\input.cc -Fosrc\input.obj
|
||||
|
||||
src\bool-array.obj : src\bool-array.cc $(BOOL_ARRAY_H) $(OPTIONS_H)
|
||||
$(CXX) $(INCLUDES) $(CXXFLAGS) -c src\bool-array.cc -Fosrc\bool-array.obj
|
||||
|
||||
src\hash-table.obj : src\hash-table.cc $(HASH_TABLE_H) $(OPTIONS_H)
|
||||
$(CXX) $(INCLUDES) $(CXXFLAGS) -c src\hash-table.cc -Fosrc\hash-table.obj
|
||||
|
||||
src\search.obj : src\search.cc $(SEARCH_H) $(OPTIONS_H) $(HASH_TABLE_H) $(CONFIG_H)
|
||||
$(CXX) $(INCLUDES) $(CXXFLAGS) -c src\search.cc -Fosrc\search.obj
|
||||
|
||||
src\output.obj : src\output.cc $(OUTPUT_H) $(OPTIONS_H) $(VERSION_H)
|
||||
$(CXX) $(INCLUDES) $(CXXFLAGS) -c src\output.cc -Fosrc\output.obj
|
||||
|
||||
src\main.obj : src\main.cc $(OPTIONS_H) $(INPUT_H) $(SEARCH_H) $(OUTPUT_H)
|
||||
$(CXX) $(INCLUDES) $(CXXFLAGS) -c src\main.cc -Fosrc\main.obj
|
||||
|
||||
gperf.exe : $(OBJECTS)
|
||||
$(CC) $(MFLAGS) $(DEBUGFLAGS) $(OBJECTS) -Fegperf.exe
|
||||
|
||||
install : all force
|
||||
-mkdir $(prefix)
|
||||
-mkdir $(exec_prefix)
|
||||
-mkdir $(bindir)
|
||||
$(INSTALL_PROGRAM) gperf.exe $(bindir)\gperf.exe
|
||||
-mkdir $(datadir)
|
||||
-mkdir $(mandir)
|
||||
-mkdir $(man1dir)
|
||||
$(INSTALL_DATA) doc\gperf.1 $(man1dir)\gperf.1
|
||||
-mkdir $(datadir)\doc
|
||||
-mkdir $(docdir)
|
||||
$(INSTALL_DATA) doc\gperf.html $(docdir)\gperf.html
|
||||
|
||||
installdirs : force
|
||||
-mkdir $(prefix)
|
||||
-mkdir $(exec_prefix)
|
||||
-mkdir $(bindir)
|
||||
-mkdir $(datadir)
|
||||
-mkdir $(mandir)
|
||||
-mkdir $(man1dir)
|
||||
-mkdir $(datadir)\doc
|
||||
-mkdir $(docdir)
|
||||
|
||||
uninstall : force
|
||||
$(RM) $(bindir)\gperf.exe
|
||||
$(RM) $(man1dir)\gperf.1
|
||||
$(RM) $(docdir)\gperf.html
|
||||
|
||||
check : all
|
||||
|
||||
mostlyclean : clean
|
||||
|
||||
clean : force
|
||||
$(RM) lib\*.obj
|
||||
$(RM) src\*.obj
|
||||
$(RM) gperf.exe
|
||||
$(RM) core
|
||||
|
||||
distclean : clean
|
||||
$(RM) src\config.h
|
||||
|
||||
maintainer-clean : distclean
|
||||
|
||||
force :
|
||||
|
||||
@@ -42,5 +42,5 @@ chmod a+x build-aux/install-sh build-aux/mkinstalldirs \
|
||||
build-aux/compile build-aux/ar-lib
|
||||
|
||||
rm -f configure lib/configure src/configure tests/configure doc/configure
|
||||
rm -f src/config.h.in src/config.h.msvc src/config.h_vms
|
||||
rm -f src/config.h.in src/config.h_vms
|
||||
make -f Makefile.devel
|
||||
|
||||
1
src/.gitignore
vendored
1
src/.gitignore
vendored
@@ -1,6 +1,5 @@
|
||||
# Files generated by the autotools:
|
||||
/configure
|
||||
/config.h.in
|
||||
/config.h.msvc
|
||||
/config.h_vms
|
||||
|
||||
|
||||
@@ -158,7 +158,7 @@ SOURCE_FILES = \
|
||||
IMPORTED_FILES =
|
||||
# List of distributed files generated by autotools or Makefile.devel.
|
||||
GENERATED_FILES = \
|
||||
configure config.h.in config.h.msvc config.h_vms
|
||||
configure config.h.in config.h_vms
|
||||
# List of distributed files generated by "make".
|
||||
DISTRIBUTED_BUILT_FILES =
|
||||
# List of distributed files.
|
||||
|
||||
Reference in New Issue
Block a user