Permalink
Browse files

New files for new configure

  • Loading branch information...
1 parent d66634b commit 2517c155bc37410e39ef43e5ab59bada735eab15 @laurentbartholdi committed Oct 16, 2012
Showing with 40,942 additions and 1,169 deletions.
  1. +19 −23 cnf/Makefile.in
  2. +74 −0 cnf/aclocal.m4
  3. +125 −108 cnf/config.guess
  4. +652 −205 cnf/config.log
  5. +32 −152 cnf/configure.ac
  6. +9,655 −0 cnf/ltmain.sh
  7. +182 −0 cnf/m4/ac_find_gap.m4
  8. +184 −0 cnf/m4/ax_cc_maxopt.m4
  9. +79 −0 cnf/m4/ax_check_compiler_flags.m4
  10. +67 −0 cnf/m4/ax_compiler_vendor.m4
  11. +221 −0 cnf/m4/ax_gcc_archflag.m4
  12. +82 −0 cnf/m4/ax_gcc_x86_cpuid.m4
  13. +7,982 −0 cnf/m4/libtool.m4
  14. +384 −0 cnf/m4/ltoptions.m4
  15. +123 −0 cnf/m4/ltsugar.m4
  16. +23 −0 cnf/m4/ltversion.m4
  17. +98 −0 cnf/m4/lt~obsolete.m4
  18. +10,879 −680 configure
  19. +4 −1 hurwitz/Makefile.in
  20. +10,077 −0 libtool
View
@@ -15,14 +15,12 @@
.PHONY: all lib doc clean distribute mrproper wwwdir checkblocks tarballs hurwitz
-LOCALBIN=bin/@TARGET@
-EXTERN=$(CURDIR)/bin/@TARGET@/extern
+LOCALBIN=bin/@GAPARCH@
+EXTERN=$(CURDIR)/bin/@GAPARCH@/extern
-CFLAGS=@CFLAGS@ -fPIC -std=c99 -Wall -I@GAPDIR@ -I@GAPDIR@/$(LOCALBIN) @GMP_CFLAGS@
-CC=@CC@ $(CFLAGS)
+MYCC=./libtool --mode=compile @CC@ $(CFLAGS) @CFLAGS@ @GAP_CPPFLAGS@ -std=c99 -g -Wall
+MYLD=./libtool --mode=link @CC@ $(CFLAGS) -g
JAVAC=@JAVAC@
-GAPPROG=@GAPPROG@
-GAC=@GAC@
GSLLIB=gsl-1.15
all: $(LOCALBIN) @LIB_TARGET@ $(LOCALBIN)/fr_dll.so @JAVABUILD@ hurwitz
@@ -44,7 +42,7 @@ gsllib: extern/$(GSLLIB).tar.gz
rm -rf $(GSLLIB) && \
tar -x -f $(GSLLIB).tar.gz -z && \
cd $(GSLLIB) && \
- ./configure --prefix=$(EXTERN) CFLAGS="$(CFLAGS) @c_options@" && \
+ ./configure --prefix=$(EXTERN) && \
$(MAKE) && \
$(MAKE) install; \
fi
@@ -54,20 +52,18 @@ distribute: wwwdir doc tarballs
$(LOCALBIN):
mkdir -p $(LOCALBIN)
-$(LOCALBIN)/rpoly.o: src/rpoly.c src/poly.h
- $(CC) -c $< -o $@
+$(LOCALBIN)/rpoly.lo: src/rpoly.c src/poly.h
+ $(MYCC) -c $< -o $@
-$(LOCALBIN)/p1.o: src/p1.c src/cpoly.C src/fr_dll.h
- $(CC) -c $< -o $@ -DCONFIG_H
+$(LOCALBIN)/p1.lo: src/p1.c src/cpoly.C src/fr_dll.h
+ $(MYCC) -c $< -o $@ -DCONFIG_H
-$(LOCALBIN)/fr_dll.o: src/fr_dll.c src/cpoly.C src/fr_dll.h
- $(CC) -c $< -o $@ -DCONFIG_H
+$(LOCALBIN)/fr_dll.lo: src/fr_dll.c src/cpoly.C src/fr_dll.h
+ $(MYCC) -c $< -o $@ -DCONFIG_H
-$(LOCALBIN)/findrat.o: src/findrat.c src/fr_dll.h
- $(CC) -c $< -o $@ -DCONFIG_H
-
-$(LOCALBIN)/fr_dll.so: $(LOCALBIN)/fr_dll.o $(LOCALBIN)/findrat.o $(LOCALBIN)/rpoly.o $(LOCALBIN)/p1.o
- $(GAC) -d -o $@ $+ @GACFLAGS@
+$(LOCALBIN)/fr_dll.so: $(LOCALBIN)/fr_dll.lo $(LOCALBIN)/rpoly.lo $(LOCALBIN)/p1.lo
+ $(MYLD) -module -o $(LOCALBIN)/fr_dll.la $+ -lgsl -rpath $(PWD)/$(LOCALBIN)
+ cp $(LOCALBIN)/.libs/fr_dll.so $@
java/javaplot.class: src/javaplot.java
$(JAVAC) -cp java/javaview.jar $< -d java
@@ -81,12 +77,12 @@ clean:
rm -rf .version config.log $(LOCALBIN) `find doc -type l`
make -C hurwitz clean
-configure: cnf/Makefile.in cnf/configure.ac
- (cd cnf; autoconf; mv -f configure ..)
-
mrproper: clean
rm Makefile
- rm hurwitz/Makefile
+ make -C hurwitz mrproper
+
+configure: cnf/Makefile.in cnf/configure.ac
+ (cd cnf; aclocal -Im4; autoconf; mv -f configure ..)
.version: PackageInfo.g
grep '^Version :=' $< | awk -F'"' '{print $$2}' > $@
@@ -96,7 +92,7 @@ doc: doc/chap0.html
doc/chap0.html: doc/fr.xml doc/frbib.xml gap/algebra.gd gap/frelement.gd \
gap/group.gd gap/img.gd gap/perlist.gd gap/vector.gd gap/examples.gd \
gap/frmachine.gd gap/helpers.gd gap/mealy.gd gap/trans.gd
- echo 'LoadPackage("fr"); DOC@FR();' | $(GAPPROG) -r -q
+ echo 'LoadPackage("fr"); DOC@FR();' | @GAP_EXEC@ -r -q
(cd doc; git add *.html manual.pdf manual.css; git commit -m 'New html files'; git push github master:gh-pages)
checkblocks:
View
@@ -0,0 +1,74 @@
+# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+
+# This file 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# AM_CONDITIONAL -*- Autoconf -*-
+
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+ AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+m4_include([m4/ac_find_gap.m4])
+m4_include([m4/ax_cc_maxopt.m4])
+m4_include([m4/ax_check_compiler_flags.m4])
+m4_include([m4/ax_compiler_vendor.m4])
+m4_include([m4/ax_gcc_archflag.m4])
+m4_include([m4/ax_gcc_x86_cpuid.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
Oops, something went wrong.

0 comments on commit 2517c15

Please sign in to comment.