Renaming.

diff --git a/Makefile b/Makefile
index 166d6ff..fbe1353 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,10 +35,10 @@ all: flatland TAGS
 TAGS: *.cc *.h
        etags *.cc *.h
 
 TAGS: *.cc *.h
        etags *.cc *.h
 

-flatland: flatland_generator.so
+flatland: libflatland.so

        ./build.py
 
        ./build.py
 

-flatland_generator.so: \
+libflatland.so: \

        sequence_generator.o misc.o \
        polygon.o universe.o \
        canvas.o canvas_cairo.o
        sequence_generator.o misc.o \
        polygon.o universe.o \
        canvas.o canvas_cairo.o

diff --git a/build.py b/build.py
index 3078209..b3c7b91 100755 (executable)
--- a/build.py
+++ b/build.py
@@ -21,21 +21,20 @@
 #  along with flatland.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 #  along with flatland.  If not, see <http://www.gnu.org/licenses/>.
 #
 

-import os
+from os import path

 from torch.utils.ffi import create_extension
 
 from torch.utils.ffi import create_extension
 

-abs_path = os.path.dirname(os.path.abspath(__file__))
+abs_path = path.dirname(path.abspath(__file__))

 
 ffi = create_extension(
     'flatland',
     headers = [ 'flatland.h' ],
     sources = [ 'flatland.c' ],
 
 ffi = create_extension(
     'flatland',
     headers = [ 'flatland.h' ],
     sources = [ 'flatland.c' ],

-    extra_objects = [ abs_path + '/flatland_generator.so' ],
+    extra_objects = [ abs_path + '/libflatland.so' ],

     libraries = [ ],
     library_dirs = [ ],
     define_macros = [ ],
     with_cuda = False
 )
 
     libraries = [ ],
     library_dirs = [ ],
     define_macros = [ ],
     with_cuda = False
 )
 

-if __name__ == '__main__':
-    ffi.build()
+ffi.build()