[Pkg-wmaker-commits] [wmbiff] 16/19: add scripts subdirectory to build system

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to tag wmbiff_0_4_11
in repository wmbiff.

commit a0cc560609bc9391a72729ad01963e64592cbf38
Author: bluehal <bluehal>
Date:   Sun Dec 29 04:54:39 2002 +0000

    add scripts subdirectory to build system
---
 Makefile.am       |  4 ++--
 check-includes.rb | 38 ++++++++++++++++++++++++++++++++++++++
 configure.ac      |  2 +-
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6f84a59..ec21caf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = wmgeneral wmbiff autoconf
+SUBDIRS = wmgeneral wmbiff autoconf scripts
 EXTRA_DIST = ChangeLog FAQ README.licq TODO
 
 ACLOCAL_FLAGS = -I autoconf
@@ -11,7 +11,7 @@ ACLOCAL_FLAGS = -I autoconf
 # stamp-h.in appears somewhere
 # Makefile.in and configure are obviously generated.
 MAINTAINERCLEANFILES = aclocal.m4 config.h.in stamp-h.in  \
-  Makefile.in configure
+  Makefile.in configure Changelog.bak stamp-h1
 maintainer-clean-local:
 	rm -f *~
 
diff --git a/check-includes.rb b/check-includes.rb
new file mode 100755
index 0000000..466d0f3
--- /dev/null
+++ b/check-includes.rb
@@ -0,0 +1,38 @@
+#!/usr/bin/ruby
+
+# some OSes are finicky about the order of included header
+# files.  this script looks through the .c files in wmbiff
+# to verify that some headers (like sys/types) are included
+# before others.
+
+$failed = 0
+FILES = 'wmgeneral/*.[ch] wmbiff/*.[ch]'
+
+def include_a_before_b(first, second) 
+    typeincl = Hash.new(9000)
+    IO.popen("egrep -n \"#{first}[>.]\" " + FILES, 'r').readlines.each { |l|
+        file,line,text = l.split(':');
+        typeincl[file] = line;
+    }
+    
+    IO.popen("grep -n \"#{second}[>.]\" " + FILES, 'r').readlines.each { |l|
+        file,line,text = l.split(':');
+        if(typeincl[file].to_i > line.to_i) then
+            $failed = 1;
+            if( typeincl[file].to_i < 9000 ) then
+              puts "#{file}:#{typeincl[file].to_i} doesn't include #{first} (line #{typeincl[file].to_i}) before #{second}"
+            else
+              puts "#{file}:#{line.to_i} doesn't include #{first} though it includes #{second}"
+            end
+        end
+    }
+end
+
+include_a_before_b("sys/types", "sys/socket") 
+include_a_before_b("sys/types", "netinet/in_systm") 
+include_a_before_b("netinet/in_systm", "netinet/ip") 
+include_a_before_b("netinet/in", "netinet/ip") 
+include_a_before_b("sys/types", "sys/resource")  # not sure if there's more 
+include_a_before_b("sys/time", "sys/resource")   # order here.
+
+Kernel.exit($failed)
diff --git a/configure.ac b/configure.ac
index eefd657..1dc4308 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,7 +114,7 @@ AC_DEFINE_UNQUOTED(DEFAULT_SKIN_PATH,
                    "$SKINDIR:/usr/share/wmbiff/skins:/usr/local/share/wmbiff/skins:.", [Path to use when finding skins (modified pixmaps)] )
 
 dnl We're done.
-AC_CONFIG_FILES(Makefile wmbiff/Makefile wmgeneral/Makefile wmbiff/wmbiffrc.5 autoconf/Makefile)
+AC_CONFIG_FILES(Makefile wmbiff/Makefile wmgeneral/Makefile wmbiff/wmbiffrc.5 autoconf/Makefile scripts/Makefile)
 AC_OUTPUT
 dnl remind not to write the file.
 chmod 0444 wmbiff/wmbiffrc.5

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git