1 files changed, 14 insertions, 2 deletions
diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py
index a84ae74..c0fdc85 100755
--- a/scripts/MakeHeader.py
+++ b/scripts/MakeHeader.py
@@ -28,8 +28,9 @@ selfheader = '#include "' + name + '.h"'
 out.write( "/* Do not edit this file. It was automatically generated. */" )
 out.write( "" )
 
-out.write( "#ifndef HEADER_" + name )
-out.write( "#define HEADER_" + name )
+out.write( "#ifndef HEADER_" + os.path.basename(name) )
+out.write( "#define HEADER_" + os.path.basename(name) )
+is_blank = False
 for line in file.readlines():
    line = line[:-1]
    if state == ANY:
@@ -37,6 +38,8 @@ for line in file.readlines():
          state = COPY
       elif line == selfheader:
          pass
+      elif line.find("#include") == 0:
+         pass
       elif line.find("htop - ") == 0 and line[-2:] == ".c":
          out.write(line[:-2] + ".h")
       elif line.find("static ") != -1:
@@ -58,14 +61,22 @@ for line in file.readlines():
             state = SKIP
          else:
             out.write( line )
+         is_blank = False
+      elif line == "":
+         if not is_blank:
+            out.write( line )
+         is_blank = True
       else:
          out.write( line )
+         is_blank = False
    elif state == COPY:
+      is_blank = False
       if line == "}*/":
          state = ANY
       else:
          out.write( line )
    elif state == SKIP:
+      is_blank = False
       if len(line) >= 1 and line[0] == "}":
          if static == 1:
             state = SKIPONE
@@ -73,6 +84,7 @@ for line in file.readlines():
             state = ANY
          static = 0
    elif state == SKIPONE:
+      is_blank = False
       state = ANY
 
 out.write( "" )