Permalink
Browse files

Misc fixes and cleanups.

git-svn-id: https://svn.r-project.org/R/trunk@8294 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 6d83149 commit b2a3d9aa659b32732d5d071467de25f652a67a3a hornik committed Feb 21, 2000
View
@@ -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 \
@@ -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
View
@@ -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) $@)
@@ -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 \
@@ -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 \
@@ -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 \
@@ -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::
@@ -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$$$$; \
@@ -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
@@ -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:
@@ -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$$$$; \
@@ -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:
@@ -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 \
@@ -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$$$$; \
@@ -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 \
@@ -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:
@@ -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$$$$; \
@@ -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 \
@@ -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:
@@ -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$$$$; \
@@ -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 \
@@ -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:
@@ -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$$$$; \
@@ -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 \
@@ -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:
@@ -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$$$$; \
@@ -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:
@@ -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$$$$; \
@@ -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:
@@ -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$$$$; \
@@ -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:
@@ -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$$$$; \
@@ -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:
@@ -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

0 comments on commit b2a3d9a

Please sign in to comment.