Updated freeze.py to the new Makefile symbol layout.

Fixed a few compiler warnings.

freeze.py now produces binaries which can import shared
modules (unlike before).

diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py
index c347d5358db52ddad338d7bd617975a7b13ff3b0..0b9b20639fc131a1df2cf10c366a1b628b8d6a1c 100755 (executable)
--- a/Tools/freeze/freeze.py
+++ b/Tools/freeze/freeze.py
@@ -464,7 +464,7 @@ def main():
 
     somevars['CFLAGS'] = string.join(cflags) # override
     somevars['CPPFLAGS'] = string.join(cppflags) # override
-    files = ['$(OPT)', '$(LDFLAGS)', base_config_c, base_frozen_c] + \
+    files = [base_config_c, base_frozen_c] + \
             files + supp_sources +  addfiles + libs + \
             ['$(MODLIBS)', '$(LIBS)', '$(SYSLIBS)']
 

diff --git a/Tools/freeze/makeconfig.py b/Tools/freeze/makeconfig.py
index 687f27177bac74ed289a7caa5c282338a51d9b1f..2f04ac7f57376ce97018a9d6ef44f091145c0466 100644 (file)
--- a/Tools/freeze/makeconfig.py
+++ b/Tools/freeze/makeconfig.py
@@ -19,7 +19,7 @@ def makeconfig(infp, outfp, modules, with_ifdef=0):
                                        continue
                                if with_ifdef:
                                        outfp.write("#ifndef init%s\n"%mod)
-                               outfp.write('extern void init%s();\n' % mod)
+                               outfp.write('extern void init%s(void);\n' % mod)
                                if with_ifdef:
                                        outfp.write("#endif\n")
                elif m2 and m2.search(line):

diff --git a/Tools/freeze/makefreeze.py b/Tools/freeze/makefreeze.py
index ac59a9cbd9cd8c81b184a0ed7f4caae146d5af70..38880501124e63611e76f5ed15e28407dd869970 100644 (file)
--- a/Tools/freeze/makefreeze.py
+++ b/Tools/freeze/makefreeze.py
@@ -18,9 +18,7 @@ trailer = """\
 # if __debug__ == 0 (i.e. -O option given), set Py_OptimizeFlag in frozen app.
 default_entry_point = """
 int
-main(argc, argv)
-    int argc;
-    char **argv;
+main(int argc, char **argv)
 {
        extern int Py_FrozenMain(int, char **);
 """ + ((not __debug__ and """

diff --git a/Tools/freeze/makemakefile.py b/Tools/freeze/makemakefile.py
index b1bad2b46dae037e5cc35ef43a814d8e04d863e7..e33e32e21e3330bd19ac2a252198317f6e04790c 100644 (file)
--- a/Tools/freeze/makemakefile.py
+++ b/Tools/freeze/makemakefile.py
@@ -24,7 +24,7 @@ def makemakefile(outfp, makevars, files, target):
             deps.append(dest)
 
     outfp.write("\n%s: %s\n" % (target, string.join(deps)))
-    outfp.write("\t$(CC) %s -o %s $(LDLAST)\n" % 
+    outfp.write("\t$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) %s -o %s $(LDLAST)\n" % 
                 (string.join(files), target))
 
     outfp.write("\nclean:\n\t-rm -f *.o %s\n" % target)