--- rpl/tools/Attic/Makefile.in 2010/05/09 15:43:50 1.16 +++ rpl/tools/Attic/Makefile.in 2011/09/20 09:51:43 1.63 @@ -47,21 +47,26 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ABI = @ABI@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BSH_PATH = @BSH_PATH@ +BUILD_OPENMOTIF = @BUILD_OPENMOTIF@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COCOA = @COCOA@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +C_STANDARD = @C_STANDARD@ DATE = @DATE@ DATE_FR = @DATE_FR@ DEBUG = @DEBUG@ @@ -72,9 +77,11 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ELF = @ELF@ EXEEXT = @EXEEXT@ EXPERIMENTAL_CODE = @EXPERIMENTAL_CODE@ EXPORT_DYNAMIC = @EXPORT_DYNAMIC@ +EXT_SQL = @EXT_SQL@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ @@ -82,6 +89,8 @@ FFLAGS = @FFLAGS@ FILE = @FILE@ FINAL_ENCODING = @FINAL_ENCODING@ FORCE_GNUPLOT_PATH = @FORCE_GNUPLOT_PATH@ +GIAC = @GIAC@ +GMP = @GMP@ GNUPLOT = @GNUPLOT@ GNUPLOT_COMPILATION = @GNUPLOT_COMPILATION@ GNUPLOT_P = @GNUPLOT_P@ @@ -91,25 +100,36 @@ GREP = @GREP@ GS = @GS@ GSL = @GSL@ GV = @GV@ +HOST = @HOST@ ICONV = @ICONV@ +INCMOTIF = @INCMOTIF@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +IPCS_SYSV = @IPCS_SYSV@ +IPV6 = @IPV6@ LATEX = @LATEX@ LDFLAGS = @LDFLAGS@ +LIBMOTIF = @LIBMOTIF@ LIBOBJS = @LIBOBJS@ +LIBRPLCAS = @LIBRPLCAS@ LIBS = @LIBS@ +LIBXPM = @LIBXPM@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MALLOC = @MALLOC@ MKDIR_P = @MKDIR_P@ MOTIF_SUPPORT = @MOTIF_SUPPORT@ +MPFR = @MPFR@ MYSQL_SUPPORT = @MYSQL_SUPPORT@ NCURSES = @NCURSES@ NESTED_FUNCTIONS = @NESTED_FUNCTIONS@ +NTL = @NTL@ OBJEXT = @OBJEXT@ +OPENMOTIF = @OPENMOTIF@ OPENSSL = @OPENSSL@ OS = @OS@ PACKAGE = @PACKAGE@ @@ -119,17 +139,21 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PARI = @PARI@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSTGRESQL_SUPPORT = @POSTGRESQL_SUPPORT@ POSTSCRIPT_SUPPORT = @POSTSCRIPT_SUPPORT@ PROFILAGE = @PROFILAGE@ RANLIB = @RANLIB@ READLINE = @READLINE@ +RPLCAS = @RPLCAS@ RUNPATH = @RUNPATH@ SED = @SED@ SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@ +SEMUN = @SEMUN@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SIGSEGV = @SIGSEGV@ SQLITE = @SQLITE@ STRIP = @STRIP@ TEX = @TEX@ @@ -197,7 +221,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \ - @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ + @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@ sysconfdir = @sysconfdir@ target = @target@ @@ -210,7 +234,19 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = @NCURSES@.tar.gz @READLINE@.tar.gz @UNITS@.tar.gz @GSL@.tar.gz \ @GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \ - @FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz + @FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz \ + @OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz \ + @NCURSES@-20110409.patch.gz @NCURSES@-20110416.patch.gz \ + @NCURSES@-20110423.patch.gz @NCURSES@-20110430.patch.gz \ + @NCURSES@-20110507.patch.gz @NCURSES@-20110514.patch.gz \ + @NCURSES@-20110521.patch.gz @NCURSES@-20110528.patch.gz \ + @NCURSES@-20110604.patch.gz @NCURSES@-20110611.patch.gz \ + @NCURSES@-20110625.patch.gz @NCURSES@-20110626.patch.gz \ + @NCURSES@-20110702.patch.gz @NCURSES@-20110716.patch.gz \ + @NCURSES@-20110723.patch.gz @NCURSES@-20110730.patch.gz \ + @NCURSES@-20110807.patch.gz @NCURSES@-20110813.patch.gz \ + @NCURSES@-20110820.patch.gz @NCURSES@-20110903.patch.gz \ + @NCURSES@-20110910.patch.gz openmotif.lib all: all-am @@ -385,31 +421,53 @@ uninstall-am: all: TMP=$$(mktemp tmp.XXXXXXXXXX); \ - sed s/DREADLINE/UREADLINE/g @UNITS@/Makefile > $$TMP; \ - \mv -f $$TMP @UNITS@/Makefile + sed -e 's/DREADLINE/UREADLINE/g' @UNITS@/Makefile | \ + sed -e 's/-lreadline//g' | sed -e 's/-lncurses//g' > $$TMP; \ + mv -f $$TMP @UNITS@/Makefile @list='$(subdirs)'; for subdir in $$list; do \ echo "Making $@ in $$subdir"; \ - $(MAKE) -C $$subdir $@ ; \ + if [ $$subdir = @OPENSSL@ ]; then \ + if [ @OS@ = "OS2" ]; then \ + $(MAKE) -C $$subdir -j1 -f OS2-EMX.mak2; \ + else \ + $(MAKE) -C $$subdir -j1 $@; \ + fi; \ + else \ + if [ $$subdir = @UNITS@ -a @OS@ = OpenBSD ]; then \ + TMP=$$(mktemp tmp.XXXXXXXXXX); \ + sed -e 's/^DEFS = -DUNITSFILE/DEFS = -Dmalloc=malloc -DUNITSFILE/g' \ + @UNITS@/Makefile > $$TMP; \ + mv -f $$TMP @UNITS@/Makefile; \ + fi; \ + $(MAKE) -C $$subdir $@; \ + fi; \ done; if [ ! -f @OPENSSL@/tests_success ]; then \ - (cd @OPENSSL@ && $(MAKE) test && touch tests_success); \ + if [ @OS@ = "OS2" ]; then \ + (cd @OPENSSL@ && touch tests_success); \ + else \ + (cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \ + fi; \ + fi + touch openmotif.lib && rm openmotif.lib; + if [ x@BUILD_OPENMOTIF@ = x ]; then \ + touch openmotif.lib; \ + else \ + echo -n LD_MOTIF_ > openmotif.lib; \ + grep "^LIBS=" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \ + echo -n LD_MOTIF_ >> openmotif.lib; \ + grep "^X_XMU" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \ fi - $(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ - $(top_builddir)/tools/@FILE@/src/*.o \ - $(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \ - cut -d= -f2) $(LDFLAGS) clean distclean: @list='$(subdirs)'; for subdir in $$list; do \ echo "Cleaning $$subdir"; \ - if [ $$subdir = @OPENSSL@ ]; then \ - $(MAKE) -C $$subdir -j1 $@; \ - else \ + if [ ! $$subdir = @OPENSSL@ ]; then \ $(MAKE) -C $$subdir $@; \ fi; \ done; if [ -f @OPENSSL@/tests_success ]; then \ - \rm -f @OPENSSL@/tests_success; \ + rm -f @OPENSSL@/tests_success; \ fi install: all @@ -431,7 +489,7 @@ install: all $(DESTDIR)$(bindir)/rplfile$(EXEEXT) uninstall: - \rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) \ + rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) \ $(DESTDIR)$(datadir)/rplunits \ $(DESTDIR)$(bindir)/rplpp$(EXEEXT) \ $(DESTDIR)$(mandir)/man1/gpp.1 \