Skip to content

Commit

Permalink
Remove some dead wood from top Makefile and configuration script.
Browse files Browse the repository at this point in the history
  • Loading branch information
jcbeaudoin committed Jan 7, 2017
1 parent 72b667f commit 488702a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 93 deletions.
94 changes: 7 additions & 87 deletions Makefile.in
Expand Up @@ -3,7 +3,7 @@
# DIST: that first.
#
#
# Copyright (c) 2010, Jean-Claude Beaudoin.
# Copyright (c) 2010,2017, Jean-Claude Beaudoin.
# Copyright by a number of previous anonymous authors
# presumed to be the same as for the rest of MKCL.
#
Expand All @@ -21,7 +21,7 @@
# make install to install it.
# make TAGS to update tags tables.
#
# make clean or make mostlyclean
# make clean
# Delete all files from the current directory that are normally
# created by building the program. Don't delete the files that
# record the configuration. Also preserve files that could be made
Expand All @@ -43,14 +43,8 @@
# everything deleted by distclean.

SHELL = /bin/sh
MACHINE = @MACHINE_VERSION@
RM = @RM@

# ========================= Last release ================================

VERSION=@PACKAGE_VERSION@
WWW=
ADDRESS=

# ==================== Things `configure' Might Edit ====================

Expand All @@ -66,44 +60,25 @@ mandir=@mandir@
libdir=@libdir@
datarootdir=@datarootdir@

# What to release
TAR_CONTENTS=Makefile.in README.1st LGPL ANNOUNCEMENT Copyright doc \
configure src/c src/cmp src/clos src/CHANGELOG src/lsp src/doc \
src/mkcl src/gmp src/config* src/install.sh src/Makefile.in \
src/util contrib/ src/clx src/gc src/*.in src/*.m4 src/gabriel \
src/tests/Makefile.in src/ansi-tests/Makefile.in msvc examples

# ==================== Utility Programs for the Build ====================

# Allow the user to specify the install program.
@SET_MAKE@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@

# ============================= Build ==============================

all: depend
all:
cd src; $(MAKE) all
.PHONY: all

Makefile: Makefile.in src/config.status
(cd src; ./config.status)

depend:
cd src; $(MAKE) depend


# ==================== Installation ====================

INSTALL_TARGET = @INSTALL_TARGET@

install: src/Makefile
cd src; $(MAKE) $(INSTALL_TARGET)
install:
cd src; $(MAKE) install

uninstall:
cd src; $(MAKE) uninstall

.PHONY: all install uninstall clean distclean realclean

# ==================== Cleaning up and miscellanea ====================

# `clean'
Expand Down Expand Up @@ -140,58 +115,3 @@ realclean: distclean
$(RM) src/*~ src/c/*~ src/c/arch/*~
$(RM) src/lsp/*~ src/clos/*~ src/cmp/*~

# ==================== Various means of distribution ====================

TAR_DIR=mkcl-$(VERSION)

doc: src/doc/index.html
-mkdir doc
(cd src/doc; $(MAKE) html); cp src/doc/*.html doc
src/doc/index.html:
cd src/doc; $(MAKE)

source-dist: $(TAR_DIR).tgz

rpmdir=$(shell rpm --showrc | grep '^-[0-9]*:.*[^{]_topdir' | sed 's,^.*topdir[ ]*\(.*\)[ ]*,\1,')
rpmbuild=$(shell if [ -z `which rpmbuild` ]; then echo "rpm"; else echo "rpmbuild"; fi)

# OBSOLETE!!!
# rpm: doc
# -rm -rf $(TAR_DIR)
# mkdir $(TAR_DIR) $(TAR_DIR)/src \
# $(TAR_DIR)/src/tests $(TAR_DIR)/src/ansi-tests && \
# for i in $(TAR_CONTENTS); do cp -rf $$i $(TAR_DIR)/$$i; done && \
# tar -cz --exclude '*~' --exclude '#*' --exclude 'CVS' -f $(rpmdir)/SOURCES/$(TAR_DIR).tgz $(TAR_DIR)
# if [ -f /etc/SuSE-release ]; then HOST=SUSE; else HOST=REDHAT; fi; \
# cat src/util/mkcl.spec |\
# sed 's,MKCL_VERSION,$(VERSION),;s,^#% '$${HOST}' ,,g;'|\
# grep -v '^#% ' > $(rpmdir)/SPECS/mkcl.spec;
# rpm -ba $(rpmdir)/SPECS/mkcl.spec

$(TAR_DIR):
git clone .git $(TAR_DIR)
$(TAR_DIR).tgz: $(TAR_DIR)
cd $(TAR_DIR) && git pull && git reset --hard
tar -cz --exclude .git -f $(TAR_DIR).tgz $(TAR_DIR)

binary-dist: all
su -c "rm -rf tmp"
mkdir tmp
for i in tmp$(bindir) tmp$(infodir) tmp$(mandir) tmp$(libdir); do \
(echo $$i; IFS="/"; \for k in $$i; do echo $$k; (test -d $$k || mkdir $$k); chmod 755 $$k; cd $$k; done); \
done
prefix=`pwd`/tmp; cd src; $(MAKE) install prefix=$(prefix)
su -c "chown -R root.root tmp && cd tmp; tar czf ../mkcl-$(VERSION)-$(MACHINE).tgz * && cd .. && rm -rf tmp"

# This creates a ZIP file with a flattened directory structure
windows-dist: all
cd src; rm -rf $(TAR_DIR); mkdir $(TAR_DIR); \
$(MAKE) flatinstall prefix=`pwd`/$(TAR_DIR); \
zip -r $(TAR_DIR).zip $(TAR_DIR)
windows-nsi: all
cd src; rm -rf $(TAR_DIR); mkdir $(TAR_DIR); \
$(MAKE) flatinstall prefix=`pwd`/$(TAR_DIR)
`pwd`/src/util/mkcl_nsi.sh `pwd`/src/util/mkcl.nsi src/$(TAR_DIR)
makensis.exe src/$(TAR_DIR)/mkcl.nsi
mv src/$(TAR_DIR)/Setup.exe mkcl-$(VERSION).exe

4 changes: 2 additions & 2 deletions src/Makefile.in
Expand Up @@ -452,10 +452,10 @@ install-contribs: $(ASDF_FASLS) $(ASDF2_FASLS) $(CONTRIB_FASLS) libmkcc1.a
fi \
done
if [ -d ../contrib/asdf2-bundle ]; then \
(cd ../contrib/; tar cf - asdf2-bundle) | (cd $(mkcldir)/contrib/; tar xof -); \
cp -pR ../contrib/asdf2-bundle $(mkcldir)/contrib/; \
fi
if [ -d ../contrib/slime ]; then \
(cd ../contrib/; tar cf - slime) | (cd $(mkcldir)/contrib/; tar xof -); \
cp -pR ../contrib/slime $(mkcldir)/contrib/; \
fi

install-local: install-base-local install-contribs-local
Expand Down
2 changes: 0 additions & 2 deletions src/aclocal.m4
Expand Up @@ -192,7 +192,6 @@ AC_SUBST(SHAREDEXT)dnl Name components of a dynamically linked library
AC_SUBST(SHAREDPREFIX)
AC_SUBST(OBJEXT)dnl These are set by autoconf
AC_SUBST(EXEEXT)
AC_SUBST(INSTALL_TARGET)dnl Which type of installation: flat directory or unix like.
AC_SUBST(thehost)
CFLAGS=''
LDRPATH='~*'
Expand Down Expand Up @@ -321,7 +320,6 @@ case "${host_os}" in
SHAREDEXT='dll'
SONAME="libmkcl.SOVERSION.${SHAREDEXT}"
PICFLAG=''
INSTALL_TARGET='flatinstall'
TCP_LIBS='-lws2_32'
case "$(cmd //C ver)" in
*Windows\ NT*) WINVER='WinNT' ;;
Expand Down
2 changes: 0 additions & 2 deletions src/configure
Expand Up @@ -655,7 +655,6 @@ SONAME3
INSTALL_INFO
INFOEXT
thehost
INSTALL_TARGET
SHAREDPREFIX
SHAREDEXT
LIBEXT
Expand Down Expand Up @@ -4112,7 +4111,6 @@ case "${host_os}" in
SHAREDEXT='dll'
SONAME="libmkcl.SOVERSION.${SHAREDEXT}"
PICFLAG=''
INSTALL_TARGET='flatinstall'
TCP_LIBS='-lws2_32'
case "$(cmd //C ver)" in
*Windows\ NT*) WINVER='WinNT' ;;
Expand Down

0 comments on commit 488702a

Please sign in to comment.