Skip to content

Commit

Permalink
Misc fixes and cleanups.
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.r-project.org/R/trunk@8294 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information
hornik committed Feb 21, 2000
1 parent 6d83149 commit b2a3d9a
Show file tree
Hide file tree
Showing 16 changed files with 73 additions and 38 deletions.
15 changes: 9 additions & 6 deletions Makefile.in
View file
Expand Up @@ -20,11 +20,19 @@ SUBDIRS = src afm demos doc etc tests tools

GZIP = --best

all: Makefile R docs
all: Makefile Makeconf R docs

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
Makeconf: $(srcdir)/Makeconf.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status

config.status: $(srcdir)/configure
$(SHELL) ./config.status --recheck
$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4
cd $(srcdir) && autoconf

R:
@if [ "$(srcdir)" != "." ]; then \
Expand Down Expand Up @@ -107,11 +115,6 @@ uninstall:
@echo "uninstalling executables ..."
@rm -rf $(rhome)/bin
@rm -f $(bindir)/R
## FIXME: old stuff
@for f in R Rd2txt Rdconv Rdindex Sd2Rd; do \
rm -f $(bindir)/$${f}; \
done
##
@for f in $(INSTFILES); do \
rm -f $(rhome)/$${f}; \
done
Expand Down
3 changes: 1 addition & 2 deletions doc/Makefile.in
View file
Expand Up @@ -74,8 +74,7 @@ uninstall:
rmdir $(rhome)/doc 2> /dev/null \
|| echo " subdir doc not removed"; \
fi
@(cd $(mandir)/man1; \
rm -f R.1 Rdconv.1 Rd2txt.1 Rdindex.1 Sd2Rd.1)
@rm -f $(mandir)/man1/R.1

dvi info pdf::
@(cd manual && $(MAKE) $@)
Expand Down
2 changes: 1 addition & 1 deletion doc/manual/Makefile.in
View file
Expand Up @@ -222,7 +222,7 @@ mostlyclean: clean
clean:
@echo "cleaning in doc/manual"
@if [ "$(srcdir)" != "." ]; then \
rm -rf Rd.sty Rd2dvi.tex images; \
rm -rf Rd.sty images; \
fi
@-rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.info* *.ky *.kys \
*.log *.out *.pdf *.pg *.pgs *.ps *.ps-2 *.tmp *.toc *.tp \
Expand Down
16 changes: 6 additions & 10 deletions src/include/Makefile.in
View file
Expand Up @@ -10,17 +10,13 @@ subdir = src/include

include $(top_builddir)/Makeconf

#SRC_HEADERS = Applic.h Arith.h Complex.h Error.h \
# Fortran.h Linpack.h Mathlib.h Memory.h PrtUtil.h Random.h \
# Rdefines.h Rinternals.h S.h S_compat.h Utils.h f2c.h \
# R.h RS.h Constants.h # Blas.h
SRC_HEADERS = R.h S.h Rdefines.h Rinternals.h S_compat.h
R_EXT_HEADERS = Applic.h Arith.h Complex.h Constants.h Error.h \
Linpack.h Mathlib.h Memory.h PrtUtil.h Random.h RS.h Utils.h f2c.h
OBJ_HEADERS = Rconfig.h Rversion.h # config.h
Linpack.h Mathlib.h Memory.h PrtUtil.h Random.h RS.h \
Utils.h f2c.h
OBJ_HEADERS = Rconfig.h Rversion.h

distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
## FIXME: get this right when restructuring is done!
DISTFILES = Makefile.in README \
Defn.h Errormsg.h Fileio.h Fortran.h Graphics.h IOStuff.h \
Parse.h Print.h Startup.h \
Expand All @@ -35,7 +31,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status

R: Makefile config.h Rconfig.h Rversion.h FFDecl.h FFTab.h
R: Makefile Rconfig.h Rversion.h FFDecl.h FFTab.h
@$(MKINSTALLDIRS) $(top_builddir)/include
@$(MKINSTALLDIRS) $(top_builddir)/include/R_ext
@for f in $(SRC_HEADERS); do \
Expand All @@ -62,9 +58,9 @@ FFDecl.h FFTab.h:: $(top_srcdir)/src/appl/ROUTINES $(top_srcdir)/tools/GETSYMBOL

mostlyclean:
clean:
@rm -f Rconfig.h Rversion.h FFDecl.h FFTab.h
distclean:
@rm -f Makefile config.h Rconfig.h Rversion.h FFDecl.h FFTab.h
@rm -f GETSYMBOLS
@rm -f Makefile config.h
maintainer-clean: distclean

install install-strip uninstall::
Expand Down
8 changes: 6 additions & 2 deletions src/library/base/Makefile.in
View file
Expand Up @@ -13,7 +13,7 @@ include $(top_builddir)/Makeconf
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
DISTFILES = INDEX TITLE DESCRIPTION.in Makefile.in

all: Makefile
all: Makefile DESCRIPTION
@echo "building package \`base'"
@$(MKINSTALLDIRS) $(top_builddir)/library/base/R
@(f=$${TMPDIR:-/tmp}/R$$$$; \
Expand All @@ -27,7 +27,7 @@ all: Makefile
fi; \
done
@if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
$(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
$(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
$(top_builddir)/library/base; \
fi
@$(MKINSTALLDIRS) $(top_builddir)/library/base/data
Expand All @@ -39,6 +39,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status
DESCRIPTION: $(srcdir)/DESCRIPTION.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status

mostlyclean: clean
clean:
Expand Down
6 changes: 5 additions & 1 deletion src/library/ctest/Makefile.in
View file
Expand Up @@ -15,7 +15,7 @@ DISTFILES = INDEX TITLE DESCRIPTION.in Makefile.in

pkg = ctest

all: Makefile
all: Makefile DESCRIPTION
@echo "building package \`$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/R
@(f=$${TMPDIR:-/tmp}/R$$$$; \
Expand Down Expand Up @@ -46,6 +46,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status
DESCRIPTION: $(srcdir)/DESCRIPTION.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status

mostlyclean: clean
clean:
Expand Down
3 changes: 0 additions & 3 deletions src/library/ctest/src/Makefile.in
View file
Expand Up @@ -13,9 +13,6 @@ R_HOME = $(top_builddir)

SHLIB = $(pkg).@SHLIBEXT@
OBJS = alnorm.o ansari.o fexact.o kendall.o ks.o prho.o swilk.o
## swilk-f.o ppnd.o nscor.o \
# OBJS = alnorm.o ansari.o fexact.o kendall.o ks.o nscor.o ppnd.o \
# prho.o swilk.o

all: Makefile $(SHLIB)
@$(top_srcdir)/tools/mkinstalldirs \
Expand Down
8 changes: 6 additions & 2 deletions src/library/eda/Makefile.in
View file
Expand Up @@ -15,7 +15,7 @@ DISTFILES = INDEX TITLE DESCRIPTION.in Makefile.in

pkg = eda

all: Makefile
all: Makefile DESCRIPTION
@echo "building package \`$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/R
@(f=$${TMPDIR:-/tmp}/R$$$$; \
Expand All @@ -29,7 +29,7 @@ all: Makefile
fi; \
done
@if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
$(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
$(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
$(top_builddir)/library/eda; \
fi
@if test -d $(srcdir)/data; then \
Expand All @@ -46,6 +46,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status
DESCRIPTION: $(srcdir)/DESCRIPTION.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status

mostlyclean: clean
clean:
Expand Down
8 changes: 6 additions & 2 deletions src/library/lqs/Makefile.in
View file
Expand Up @@ -15,7 +15,7 @@ DISTFILES = INDEX TITLE DESCRIPTION.in Makefile.in

pkg = lqs

all: Makefile
all: Makefile DESCRIPTION
@echo "building package \`$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/R
@(f=$${TMPDIR:-/tmp}/R$$$$; \
Expand All @@ -29,7 +29,7 @@ all: Makefile
fi; \
done
@if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
$(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
$(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
$(top_builddir)/library/lqs; \
fi
@if test -d $(srcdir)/data; then \
Expand All @@ -46,6 +46,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status
DESCRIPTION: $(srcdir)/DESCRIPTION.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status

mostlyclean: clean
clean:
Expand Down
8 changes: 6 additions & 2 deletions src/library/modreg/Makefile.in
View file
Expand Up @@ -15,7 +15,7 @@ DISTFILES = COPYRIGHTS INDEX TITLE DESCRIPTION.in Makefile.in

pkg = modreg

all: Makefile
all: Makefile DESCRIPTION
@echo "building package \`$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/R
@(f=$${TMPDIR:-/tmp}/R$$$$; \
Expand All @@ -29,7 +29,7 @@ all: Makefile
fi; \
done
@if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
$(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
$(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
$(top_builddir)/library/modreg; \
fi
@if test -d $(srcdir)/data; then \
Expand All @@ -46,6 +46,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status
DESCRIPTION: $(srcdir)/DESCRIPTION.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status

mostlyclean: clean
clean:
Expand Down
8 changes: 6 additions & 2 deletions src/library/mva/Makefile.in
View file
Expand Up @@ -15,7 +15,7 @@ DISTFILES = INDEX TITLE DESCRIPTION.in Makefile.in

pkg = mva

all: Makefile
all: Makefile DESCRIPTION
@echo "building package \`$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/R
@(f=/tmp/R$$$$; \
Expand All @@ -29,7 +29,7 @@ all: Makefile
fi; \
done
@if test -f $(top_builddir)/$(subdir)/DESCRIPTION; then \
$(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
$(INSTALL_DATA) $(top_builddir)/$(subdir)/DESCRIPTION \
$(top_builddir)/library/mva; \
fi
@if test -d $(srcdir)/data; then \
Expand All @@ -46,6 +46,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status
DESCRIPTION: $(srcdir)/DESCRIPTION.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status

mostlyclean: clean
clean:
Expand Down
6 changes: 5 additions & 1 deletion src/library/nls/Makefile.in
View file
Expand Up @@ -15,7 +15,7 @@ DISTFILES = INDEX TITLE DESCRIPTION.in Makefile.in

pkg = nls

all: Makefile
all: Makefile DESCRIPTION
@echo "building package \`$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/R
@(f=$${TMPDIR:-/tmp}/R$$$$; \
Expand Down Expand Up @@ -46,6 +46,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status
DESCRIPTION: $(srcdir)/DESCRIPTION.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status

mostlyclean: clean
clean:
Expand Down
6 changes: 5 additions & 1 deletion src/library/splines/Makefile.in
View file
Expand Up @@ -15,7 +15,7 @@ DISTFILES = INDEX TITLE DESCRIPTION.in Makefile.in

pkg = splines

all: Makefile
all: Makefile DESCRIPTION
@echo "building package \`$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/R
@(f=$${TMPDIR:-/tmp}/R$$$$; \
Expand Down Expand Up @@ -46,6 +46,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status
DESCRIPTION: $(srcdir)/DESCRIPTION.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status

mostlyclean: clean
clean:
Expand Down
6 changes: 5 additions & 1 deletion src/library/stepfun/Makefile.in
View file
Expand Up @@ -15,7 +15,7 @@ DISTFILES = INDEX TITLE DESCRIPTION.in Makefile.in

pkg = stepfun

all: Makefile
all: Makefile DESCRIPTION
@echo "building package \`$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/R
@(f=$${TMPDIR:-/tmp}/R$$$$; \
Expand Down Expand Up @@ -46,6 +46,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status
DESCRIPTION: $(srcdir)/DESCRIPTION.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status

mostlyclean: clean
clean:
Expand Down
6 changes: 5 additions & 1 deletion src/library/ts/Makefile.in
View file
Expand Up @@ -15,7 +15,7 @@ DISTFILES = INDEX SOURCES TITLE DESCRIPTION.in Makefile.in

pkg = ts

all: Makefile
all: Makefile DESCRIPTION
@echo "building package \`$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/R
@(f=$${TMPDIR:-/tmp}/R$$$$; \
Expand Down Expand Up @@ -46,6 +46,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status
DESCRIPTION: $(srcdir)/DESCRIPTION.in $(top_builddir)/config.status
@cd $(top_builddir) && \
CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
$(SHELL) ./config.status

mostlyclean: clean
clean:
Expand Down
2 changes: 1 addition & 1 deletion src/main/Makefile.in
View file
Expand Up @@ -167,7 +167,7 @@ gram.c: $(srcdir)/gram.y
mostlyclean: clean
clean:
@echo "cleaning in $(subdir)"
@-rm -f R.binary R.X11 R.GNOME R-Image *core Makedeps *.d *.o
@-rm -f *core Makedeps *.d *.o
distclean: clean
@-rm -f Makefile
maintainer-clean: distclean
Expand Down

0 comments on commit b2a3d9a

Please sign in to comment.