Changeset 3659 for ThirdParty/Glpk


Ignore:
Timestamp:
Aug 11, 2016 7:04:38 AM (3 years ago)
Author:
stefan
Message:

rerun autotools

Location:
ThirdParty/Glpk/branches/autotools-update
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/branches/autotools-update/Makefile.in

    r3626 r3659  
    112112        $(ACLOCAL_M4)
    113113DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
    114         $(am__configure_deps) $(thirdpartyinclude_HEADERS) \
    115         $(am__DIST_COMMON)
     114        $(am__configure_deps) $(thirdpartyinclude_HEADERS)
    116115am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
    117116 configure.lineno config.status.lineno
     
    264263am__v_CCLD_1 =
    265264SOURCES = $(libcoinglpk_la_SOURCES)
    266 DIST_SOURCES = $(libcoinglpk_la_SOURCES)
    267265am__can_run_installinfo = \
    268266  case $$AM_UPDATE_INFO_DIR in \
     
    294292CSCOPE = cscope
    295293AM_RECURSIVE_TARGETS = cscope
    296 am__DIST_COMMON = $(srcdir)/BuildTools/Makemain.inc \
    297         $(srcdir)/Makefile.in $(srcdir)/coinglpk.pc.in \
    298         $(srcdir)/config_glpk.h.in compile config.guess config.sub \
    299         depcomp install-sh ltmain.sh missing
    300 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    301 distdir = $(PACKAGE)-$(VERSION)
    302 top_distdir = $(distdir)
    303 am__remove_distdir = \
    304   if test -d "$(distdir)"; then \
    305     find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
    306       && rm -rf "$(distdir)" \
    307       || { sleep 5 && rm -rf "$(distdir)"; }; \
    308   else :; fi
    309 am__post_remove_distdir = $(am__remove_distdir)
    310 DIST_ARCHIVES = $(distdir).tar.gz
    311 GZIP_ENV = --best
    312 DIST_TARGETS = dist-gzip
    313 distuninstallcheck_listfiles = find . -type f -print
    314 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
    315   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
    316 distcleancheck_listfiles = find . -type f -print
    317294ACLOCAL = @ACLOCAL@
    318295AMTAR = @AMTAR@
     
    12801257        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
    12811258        -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
    1282 
    1283 distdir: $(DISTFILES)
    1284         $(am__remove_distdir)
    1285         test -d "$(distdir)" || mkdir "$(distdir)"
    1286         @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
    1287         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
    1288         list='$(DISTFILES)'; \
    1289           dist_files=`for file in $$list; do echo $$file; done | \
    1290           sed -e "s|^$$srcdirstrip/||;t" \
    1291               -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
    1292         case $$dist_files in \
    1293           */*) $(MKDIR_P) `echo "$$dist_files" | \
    1294                            sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
    1295                            sort -u` ;; \
    1296         esac; \
    1297         for file in $$dist_files; do \
    1298           if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
    1299           if test -d $$d/$$file; then \
    1300             dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
    1301             if test -d "$(distdir)/$$file"; then \
    1302               find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
    1303             fi; \
    1304             if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
    1305               cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
    1306               find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
    1307             fi; \
    1308             cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
    1309           else \
    1310             test -f "$(distdir)/$$file" \
    1311             || cp -p $$d/$$file "$(distdir)/$$file" \
    1312             || exit 1; \
    1313           fi; \
    1314         done
    1315         -test -n "$(am__skip_mode_fix)" \
    1316         || find "$(distdir)" -type d ! -perm -755 \
    1317                 -exec chmod u+rwx,go+rx {} \; -o \
    1318           ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
    1319           ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
    1320           ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
    1321         || chmod -R a+r "$(distdir)"
    1322 dist-gzip: distdir
    1323         tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
    1324         $(am__post_remove_distdir)
    1325 
    1326 dist-bzip2: distdir
    1327         tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
    1328         $(am__post_remove_distdir)
    1329 
    1330 dist-lzip: distdir
    1331         tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
    1332         $(am__post_remove_distdir)
    1333 
    1334 dist-xz: distdir
    1335         tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
    1336         $(am__post_remove_distdir)
    1337 
    1338 dist-tarZ: distdir
    1339         @echo WARNING: "Support for distribution archives compressed with" \
    1340                        "legacy program 'compress' is deprecated." >&2
    1341         @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
    1342         tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
    1343         $(am__post_remove_distdir)
    1344 
    1345 dist-shar: distdir
    1346         @echo WARNING: "Support for shar distribution archives is" \
    1347                        "deprecated." >&2
    1348         @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
    1349         shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
    1350         $(am__post_remove_distdir)
    1351 
    1352 dist-zip: distdir
    1353         -rm -f $(distdir).zip
    1354         zip -rq $(distdir).zip $(distdir)
    1355         $(am__post_remove_distdir)
    1356 
    1357 dist dist-all:
    1358         $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
    1359         $(am__post_remove_distdir)
    1360 
    1361 # This target untars the dist file and tries a VPATH configuration.  Then
    1362 # it guarantees that the distribution is self-contained by making another
    1363 # tarfile.
    1364 distcheck: dist
    1365         case '$(DIST_ARCHIVES)' in \
    1366         *.tar.gz*) \
    1367           GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
    1368         *.tar.bz2*) \
    1369           bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
    1370         *.tar.lz*) \
    1371           lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
    1372         *.tar.xz*) \
    1373           xz -dc $(distdir).tar.xz | $(am__untar) ;;\
    1374         *.tar.Z*) \
    1375           uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
    1376         *.shar.gz*) \
    1377           GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
    1378         *.zip*) \
    1379           unzip $(distdir).zip ;;\
    1380         esac
    1381         chmod -R a-w $(distdir)
    1382         chmod u+w $(distdir)
    1383         mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
    1384         chmod a-w $(distdir)
    1385         test -d $(distdir)/_build || exit 0; \
    1386         dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
    1387           && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
    1388           && am__cwd=`pwd` \
    1389           && $(am__cd) $(distdir)/_build/sub \
    1390           && ../../configure \
    1391             $(AM_DISTCHECK_CONFIGURE_FLAGS) \
    1392             $(DISTCHECK_CONFIGURE_FLAGS) \
    1393             --srcdir=../.. --prefix="$$dc_install_base" \
    1394           && $(MAKE) $(AM_MAKEFLAGS) \
    1395           && $(MAKE) $(AM_MAKEFLAGS) dvi \
    1396           && $(MAKE) $(AM_MAKEFLAGS) check \
    1397           && $(MAKE) $(AM_MAKEFLAGS) install \
    1398           && $(MAKE) $(AM_MAKEFLAGS) installcheck \
    1399           && $(MAKE) $(AM_MAKEFLAGS) uninstall \
    1400           && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
    1401                 distuninstallcheck \
    1402           && chmod -R a-w "$$dc_install_base" \
    1403           && ({ \
    1404                (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
    1405                && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
    1406                && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
    1407                && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
    1408                     distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
    1409               } || { rm -rf "$$dc_destdir"; exit 1; }) \
    1410           && rm -rf "$$dc_destdir" \
    1411           && $(MAKE) $(AM_MAKEFLAGS) dist \
    1412           && rm -rf $(DIST_ARCHIVES) \
    1413           && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
    1414           && cd "$$am__cwd" \
    1415           || exit 1
    1416         $(am__post_remove_distdir)
    1417         @(echo "$(distdir) archives ready for distribution: "; \
    1418           list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
    1419           sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
    1420 distuninstallcheck:
    1421         @test -n '$(distuninstallcheck_dir)' || { \
    1422           echo 'ERROR: trying to run $@ with an empty' \
    1423                '$$(distuninstallcheck_dir)' >&2; \
    1424           exit 1; \
    1425         }; \
    1426         $(am__cd) '$(distuninstallcheck_dir)' || { \
    1427           echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
    1428           exit 1; \
    1429         }; \
    1430         test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
    1431            || { echo "ERROR: files left after uninstall:" ; \
    1432                 if test -n "$(DESTDIR)"; then \
    1433                   echo "  (check DESTDIR support)"; \
    1434                 fi ; \
    1435                 $(distuninstallcheck_listfiles) ; \
    1436                 exit 1; } >&2
    1437 distcleancheck: distclean
    1438         @if test '$(srcdir)' = . ; then \
    1439           echo "ERROR: distcleancheck can only run from a VPATH build" ; \
    1440           exit 1 ; \
    1441         fi
    1442         @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
    1443           || { echo "ERROR: files left in build directory after distclean:" ; \
    1444                $(distcleancheck_listfiles) ; \
    1445                exit 1; } >&2
    14461259check-am: all-am
    14471260check: check-am
     
    15731386.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
    15741387        clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
    1575         cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
    1576         dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
    1577         distcheck distclean distclean-compile distclean-generic \
    1578         distclean-hdr distclean-libtool distclean-tags distcleancheck \
    1579         distdir distuninstallcheck dvi dvi-am html html-am info \
     1388        cscope cscopelist-am ctags ctags-am distclean \
     1389        distclean-compile distclean-generic distclean-hdr \
     1390        distclean-libtool distclean-tags dvi dvi-am html html-am info \
    15801391        info-am install install-am install-data install-data-am \
    15811392        install-dvi install-dvi-am install-exec install-exec-am \
  • ThirdParty/Glpk/branches/autotools-update/configure

    r3642 r3659  
    76717671
    76727672
    7673 # initialize automake, don't define PACKAGE or VERSION
    7674 # TODO should we enable warnings by passing an option like -Wall
     7673# initialize automake
     7674# - don't define PACKAGE or VERSION
     7675# - disable dist target
     7676# - enable more automake warnings (all except override)
    76757677if test "`cd $srcdir && pwd`" != "`pwd`"; then
    76767678  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
Note: See TracChangeset for help on using the changeset viewer.