Changeset 8374:65b1f782c84d

Timestamp:

11/08/07 15:24:47 (6 years ago)

Author:

jvoight@…

Branch:

default

Parents:

8373:496eec91e65a (diff), 7649:cefb68d8a450 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge.

Files:

• setup.py (modified) (1 diff)
• setup.py (modified) (1 diff)

setup.py

@@ -756 +756 @@
     Extension('sage.rings.number_field.number_field_base',
               sources = ['sage/rings/number_field/number_field_base.pyx']), \
+
+    Extension('sage.rings.number_field.totallyreal_data',
+              ['sage/rings/number_field/totallyreal_data.pyx'],
+              libraries = ['gmp']),
 
     Extension('sage.rings.morphism',

setup.py

@@ -1192 +1192 @@
       data_files = [('dsage/web/static',                       
                     ['sage/dsage/web/static/dsage_web.css',
-                      'sage/dsage/web/static/dsage_web.js',
-                      'sage/dsage/web/static/jquery-latest.js',
-                      'sage/dsage/web/static/jquery.tablesorter.pack.js',
-                      'sage/dsage/web/static/asc.gif',
-                      'sage/dsage/web/static/desc.gif',
-                      'sage/dsage/web/static/bg.gif',
-                      ]),
+                     'sage/dsage/web/static/dsage_web.js',
+                     'sage/dsage/web/static/jquery-latest.js',
+                     'sage/dsage/web/static/jquery.tablesorter.pack.js',
+                     'sage/dsage/web/static/asc.gif',
+                     'sage/dsage/web/static/desc.gif',
+                     'sage/dsage/web/static/bg.gif']),
                     ('dsage/web/',
                     ['sage/dsage/web/index.html'])],