mirror of
https://git.savannah.gnu.org/git/gperf.git
synced 2025-12-02 13:09:22 +00:00
build: Use Automake in lib/.
* autopull.sh: Copy also m4/init-package-version.m4. * autogen.sh: Mention the requirement for Automake. * Makefile.devel (lib/aclocal.m4, lib/config.h.in, lib/Makefile.in): New rules. (lib/configure): Use lib/aclocal.m4 instead of the top-level aclocal.m4. (src/config.h.in): Fix rule. (totally-clean): Remove the new generated files. * lib/configure.ac: Require Autoconf >= 2.70. Change AC_INIT invocation. Invoke AC_CONFIG_MACRO_DIRS, gl_INIT_PACKAGE_VERSION, AM_INIT_AUTOMAKE, AC_CONFIG_HEADERS. Don't invoke AC_MAKE_SET, AC_PROG_CPP, AC_PROG_CXXCPP, AC_PROG_INSTALL. * lib/Makefile.am: New file. * lib/Makefile.in: Remove file. * Makefile.in (IMPORTED_FILES): Remove lib/filename.h.
This commit is contained in:
Bruno Haible
3
lib/.gitignore
vendored
3
lib/.gitignore
vendored
@@ -2,5 +2,8 @@
|
||||
/filename.h
|
||||
|
||||
# Files generated by the autotools:
|
||||
/aclocal.m4
|
||||
/configure
|
||||
/config.h.in
|
||||
/Makefile.in
|
||||
|
||||
|
||||
28
lib/Makefile.am
Normal file
28
lib/Makefile.am
Normal file
@@ -0,0 +1,28 @@
|
||||
## Makefile for the lib subdirectory of GNU gperf.
|
||||
## Copyright (C) 2025 Free Software Foundation, Inc.
|
||||
##
|
||||
## 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 <https://www.gnu.org/licenses/>.
|
||||
|
||||
## Process this file with automake to produce Makefile.in.
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.11 foreign
|
||||
|
||||
noinst_LIBRARIES = libgp.a
|
||||
libgp_a_SOURCES = \
|
||||
getopt.h getopt.c getopt1.c \
|
||||
getline.h getline.cc \
|
||||
hash.h hash.cc
|
||||
|
||||
EXTRA_DIST = \
|
||||
filename.h
|
||||
136
lib/Makefile.in
136
lib/Makefile.in
@@ -1,136 +0,0 @@
|
||||
# Makefile for gperf/lib
|
||||
|
||||
# Copyright (C) 1989, 1992-1993, 1998, 2002, 2006, 2009, 2012, 2016 Free Software Foundation, Inc.
|
||||
# Written by Douglas C. Schmidt <schmidt@ics.uci.edu>
|
||||
# and 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 <https://www.gnu.org/licenses/>.
|
||||
|
||||
#### Start of system configuration section. ####
|
||||
|
||||
# Directories used by "make":
|
||||
srcdir = @srcdir@
|
||||
|
||||
# Directories used by "make install":
|
||||
prefix = @prefix@
|
||||
local_prefix = /usr/local
|
||||
exec_prefix = @exec_prefix@
|
||||
|
||||
# Programs used by "make":
|
||||
# C compiler
|
||||
CC = @CC@
|
||||
CFLAGS = @CFLAGS@
|
||||
CPP = @CPP@
|
||||
# C++ compiler
|
||||
CXX = @CXX@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CXXCPP = @CXXCPP@
|
||||
# Both C and C++ compiler
|
||||
OBJEXT = @OBJEXT@
|
||||
# Other
|
||||
AR = @AR@
|
||||
AR_FLAGS = rc
|
||||
RANLIB = @RANLIB@
|
||||
MV = mv
|
||||
LN = ln
|
||||
RM = rm -f
|
||||
@SET_MAKE@
|
||||
|
||||
# Programs used by "make install":
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
#### End of system configuration section. ####
|
||||
|
||||
SHELL = /bin/sh
|
||||
|
||||
VPATH = $(srcdir)
|
||||
|
||||
OBJECTS = getopt.$(OBJEXT) getopt1.$(OBJEXT) getline.$(OBJEXT) hash.$(OBJEXT)
|
||||
CPPFLAGS = @CPPFLAGS@ -I$(srcdir)
|
||||
|
||||
TARGETLIB = libgp.a
|
||||
|
||||
all : $(TARGETLIB)
|
||||
|
||||
$(TARGETLIB): $(OBJECTS)
|
||||
$(RM) $@
|
||||
$(AR) $(AR_FLAGS) $@ $(OBJECTS)
|
||||
$(RANLIB) $@
|
||||
|
||||
# Don't use implicit rules, since AIX "make" and OSF/1 "make" don't always
|
||||
# expand $< correctly in this context.
|
||||
#
|
||||
#%.o : %.c
|
||||
# $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
|
||||
#
|
||||
#%.o : %.cc
|
||||
# $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
|
||||
|
||||
getopt.$(OBJEXT) : getopt.c getopt.h
|
||||
$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/getopt.c
|
||||
|
||||
getopt1.$(OBJEXT) : getopt1.c getopt.h
|
||||
$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/getopt1.c
|
||||
|
||||
getline.$(OBJEXT) : getline.cc getline.h
|
||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/getline.cc
|
||||
|
||||
hash.$(OBJEXT) : hash.cc hash.h
|
||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/hash.cc
|
||||
|
||||
install : all
|
||||
|
||||
installdirs :
|
||||
|
||||
uninstall :
|
||||
|
||||
check : all
|
||||
|
||||
mostlyclean : clean
|
||||
|
||||
clean : force
|
||||
$(RM) *~ *.s *.$(OBJEXT) *.a $(TARGETLIB) core
|
||||
|
||||
distclean : clean
|
||||
$(RM) config.status config.log config.cache Makefile
|
||||
|
||||
maintainer-clean : distclean
|
||||
|
||||
# List of source files.
|
||||
SOURCE_FILES = \
|
||||
configure.ac Makefile.in \
|
||||
getline.h getline.cc \
|
||||
hash.h hash.cc \
|
||||
getopt.h getopt.c getopt1.c
|
||||
# List of distributed files imported from other packages.
|
||||
IMPORTED_FILES =
|
||||
# List of distributed files generated by autotools or Makefile.devel.
|
||||
GENERATED_FILES = \
|
||||
configure
|
||||
# List of distributed files generated by "make".
|
||||
DISTRIBUTED_BUILT_FILES =
|
||||
# List of distributed files.
|
||||
DISTFILES = $(SOURCE_FILES) $(IMPORTED_FILES) $(GENERATED_FILES) $(DISTRIBUTED_BUILT_FILES)
|
||||
|
||||
distdir : $(DISTFILES)
|
||||
for file in $(DISTFILES); do \
|
||||
if test -f $$file; then dir='.'; else dir='$(srcdir)'; fi; \
|
||||
cp -p $$dir/$$file '$(distdir)'/$$file || exit 1; \
|
||||
done
|
||||
|
||||
force :
|
||||
@@ -1,6 +1,6 @@
|
||||
dnl autoconf configuration for gperf/lib
|
||||
|
||||
dnl Copyright (C) 1998-2024 Free Software Foundation, Inc.
|
||||
dnl Copyright (C) 1998-2025 Free Software Foundation, Inc.
|
||||
dnl Written by Douglas C. Schmidt <schmidt@ics.uci.edu>
|
||||
dnl and Bruno Haible <bruno@clisp.org>.
|
||||
dnl
|
||||
@@ -19,28 +19,26 @@ dnl
|
||||
dnl You should have received a copy of the GNU General Public License
|
||||
dnl along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
AC_PREREQ([2.64])
|
||||
AC_INIT
|
||||
AC_PREREQ([2.70])
|
||||
AC_INIT([gperf], [package])
|
||||
AC_CONFIG_SRCDIR([hash.cc])
|
||||
AC_CONFIG_AUX_DIR([../build-aux])
|
||||
AC_PROG_MAKE_SET
|
||||
AC_CONFIG_MACRO_DIRS([../m4])
|
||||
VERSION_NUMBER=`sed -n -e 's/.*version_string = "\(.*\)".*/\1/p' < $srcdir/../src/version.cc`
|
||||
gl_INIT_PACKAGE_VERSION([$VERSION_NUMBER])
|
||||
AM_INIT_AUTOMAKE
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
dnl
|
||||
dnl checks for programs
|
||||
dnl
|
||||
AC_PROG_CC
|
||||
dnl sets variable CC
|
||||
AC_PROG_CPP
|
||||
dnl sets variable CPP
|
||||
AC_PROG_CXX
|
||||
dnl sets variable CXX
|
||||
AC_PROG_CXXCPP
|
||||
dnl sets variable CXXCPP
|
||||
AC_CHECK_TOOL([AR], [ar])
|
||||
dnl sets variable AR
|
||||
AC_PROG_RANLIB
|
||||
dnl sets variable RANLIB
|
||||
AC_PROG_INSTALL
|
||||
dnl sets variables INSTALL, INSTALL_DATA, INSTALL_PROGRAM
|
||||
dnl
|
||||
dnl That's it.
|
||||
dnl
|
||||
|
||||
Reference in New Issue
Block a user