--- rpl/tools/Attic/Makefile.in 2010/02/11 14:19:06 1.3 +++ rpl/tools/Attic/Makefile.in 2010/04/07 07:23:03 1.10 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,9 +15,8 @@ @SET_MAKE@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -43,7 +41,6 @@ am__configure_deps = $(am__aclocal_m4_de mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/rplconfig.h CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -65,7 +62,6 @@ CYGPATH_W = @CYGPATH_W@ DATE = @DATE@ DATE_FR = @DATE_FR@ DEBUG = @DEBUG@ -DEBUG_CODE = @DEBUG_CODE@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DVIPS = @DVIPS@ @@ -111,12 +107,13 @@ MOTIF_SUPPORT = @MOTIF_SUPPORT@ MYSQL_SUPPORT = @MYSQL_SUPPORT@ NCURSES = @NCURSES@ OBJEXT = @OBJEXT@ +OPENSSL = @OPENSSL@ +OS = @OS@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSTGRESQL_SUPPORT = @POSTGRESQL_SUPPORT@ @@ -128,6 +125,7 @@ RUNPATH = @RUNPATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SQLITE = @SQLITE@ STRIP = @STRIP@ TEX = @TEX@ UNITS = @UNITS@ @@ -194,7 +192,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \ - @FILE@ @ICONV@ + @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ sysconfdir = @sysconfdir@ target = @target@ @@ -202,11 +200,11 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ 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 + @GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \ + @FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz all: all-am @@ -215,14 +213,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu tools/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -240,7 +238,6 @@ $(top_srcdir)/configure: $(am__configur cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): tags: TAGS TAGS: @@ -264,17 +261,13 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ || exit 1; \ fi; \ done @@ -284,7 +277,6 @@ all-am: Makefile installdirs: install-exec: install-exec-am install-data: install-data-am -uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am @@ -296,7 +288,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -315,8 +306,6 @@ dvi-am: html: html-am -html-am: - info: info-am info-am: @@ -325,28 +314,18 @@ install-data-am: install-dvi: install-dvi-am -install-dvi-am: - install-exec-am: install-html: install-html-am -install-html-am: - install-info: install-info-am -install-info-am: - install-man: install-pdf: install-pdf-am -install-pdf-am: - install-ps: install-ps-am -install-ps-am: - installcheck-am: maintainer-clean: maintainer-clean-am @@ -381,23 +360,96 @@ uninstall-am: all: + for i in $(shell find @NCURSES@ -name Makefile \ + -exec grep static {} /dev/null \; | cut -d: -f1); \ + do \ + echo -n Checking $$i; \ + TMP=$$(mktemp); \ + if [ -n "$$(grep static $$i | grep dynamic)" ]; then \ + awk \ + '{ \ + if (index($$0, "-static") != 0 && index($$0, "-dynamic") != 0) \ + { \ + for(j = 1; j <= NF; j++) \ + { \ + if (index($$j, "-static") == 0) \ + { \ + printf("%s ", $$j); \ + } \ + } \ + printf("\n"); \ + } \ + else \ + { \ + print; \ + } \ + }' $$i > $$TMP; \ + \mv -f $$TMP $$i; \ + echo -n " (fixed)"; \ + else \ + echo -n " (nothing to do)"; \ + fi; \ + echo .; \ + done; + TMP=$$(mktemp); \ + awk \ + '{ \ + if (index($$0, "LDFLAGS") == 1) \ + { \ + if (index($$0, "-static") == 0) \ + { \ + printf("%s -static\n", $$0); \ + } \ + else \ + { \ + print; \ + } \ + } \ + else \ + { \ + print; \ + } \ + }' @FILE@/src/Makefile > $$TMP; \ + \mv -f $$TMP @FILE@/src/Makefile @list='$(subdirs)'; for subdir in $$list; do \ echo "Making $@ in $$subdir"; \ $(MAKE) -C $$subdir $@ ; \ done; + if [ ! -f @OPENSSL@/tests_success ]; then \ + (cd @OPENSSL@ && $(MAKE) test && touch tests_success); \ + fi + $(AR) cru $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a \ + $(top_builddir)/tools/@ICONV@/lib/.libs/*.o + $(RANLIB) $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a +<<<<<<< Makefile.in + $(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ + $(top_builddir)/tools/@FILE@/src/file.o \ + $(top_builddir)/tools/@FILE@/src/.libs/librplfile.a \ + $(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \ + cut -d= -f2) $(LDFLAGS) +======= + $(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ + $(top_builddir)/tools/@FILE@/src/file.o \ + $(top_builddir)/tools/@FILE@/src/.libs/librplfile.a \ + $(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \ + cut -d= -f2) +>>>>>>> 1.9 clean distclean: @list='$(subdirs)'; for subdir in $$list; do \ echo "Cleaning $$subdir"; \ - $(MAKE) -C $$subdir $@ ; \ + $(MAKE) -C $$subdir $@; \ done; + \rm @OPENSSL@/tests_success install: all $(mkinstalldirs) $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) $(UNITS)/units $(DESTDIR)$(bindir)/rplconvert + $(INSTALL_PROGRAM) $(UNITS)/units$(EXEEXT) \ + $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) $(mkinstalldirs) $(DESTDIR)$(datadir) $(INSTALL_DATA) $(srcdir)/$(UNITS)/units.dat $(DESTDIR)$(datadir)/rplunits - $(INSTALL_PROGRAM) $(GPP)/src/gpp $(DESTDIR)$(bindir)/rplpp + $(INSTALL_PROGRAM) $(GPP)/src/gpp$(EXEEXT) \ + $(DESTDIR)$(bindir)/rplpp$(EXEEXT) $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(INSTALL_DATA) $(srcdir)/$(GPP)/doc/gpp.1 $(DESTDIR)$(mandir)/man1 ln -sf $(DESTDIR)$(mandir)/man1/gpp.1 $(DESTDIR)$(mandir)/man1/rplpp.1 @@ -405,26 +457,20 @@ install: all $(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi $(INSTALL_DATA) $(FILE)/magic/magic.mgc \ $(DESTDIR)$(datadir)/rplfiles.mgc - if [ -z "$(head -n1 $(FILE)/src/file | grep '^#!')" ]; then \ - $(INSTALL_PROGRAM) $(FILE)/src/.libs/rplfile \ - $(DESTDIR)$(bindir)/rplfile; \ - else \ - $(INSTALL_PROGRAM) $(FILE)/src/rplfile \ - $(DESTDIR)$(bindir)/rplfile; \ - fi - if [ -f $(FILE)/src/.libs/librplfile.so ]; then \ - $(INSTALL_DATA) $(FILE)/src/.libs/librplfile.so.1 \ - $(DESTDIR)$(libdir)/librplfile.so.1; \ - else \ - $(INSTALL_DATA) $(FILE)/src/librplfile.so.1 \ - $(DESTDIR)$(libdir)/librplfile.so.1; \ - fi - ln -sf $(DESTDIR)$(libdir)/librplfile.so.1 \ - $(DESTDIR)$(libdir)/librplfile.so + $(INSTALL_PROGRAM) $(FILE)/src/rplfile$(EXEEXT) \ + $(DESTDIR)$(bindir)/rplfile$(EXEEXT); + +uninstall: + \rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) \ + $(DESTDIR)$(datadir)/rplunits \ + $(DESTDIR)$(bindir)/rplpp$(EXEEXT) \ + $(DESTDIR)$(mandir)/man1/gpp.1 \ + $(DESTDIR)$(mandir)/man1/rplpp.1 \ + $(DESTDIR)$(datadir)/rplfiles.mgc \ + $(DESTDIR)$(bindir)/rplfile$(EXEEXT) install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: