From d1154eb460efe588eaed3d439c1caaca149fa362 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 18 Sep 2011 17:34:37 -0400
Subject: Shorten compile commands run by the build system

The DEFS line in MCONFIG had gotten so long that it exceeded 4k, and
this was starting to cause some tools heartburn.  It also made "make
V=1" almost useless, since trying to following the individual commands
run by make was lost in the noise of all of the defines.

So fix this by putting the configure-generated defines in lib/config.h
and the directory pathnames to lib/dirpaths.h.

In addition, clean up some vestigal defines in configure.in and in the
Makefiles to further shorten the cc command lines.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 lib/uuid/clear.c       | 1 +
 lib/uuid/compare.c     | 1 +
 lib/uuid/copy.c        | 1 +
 lib/uuid/gen_uuid.c    | 2 ++
 lib/uuid/gen_uuid_nt.c | 1 +
 lib/uuid/isnull.c      | 1 +
 lib/uuid/pack.c        | 1 +
 lib/uuid/parse.c       | 1 +
 lib/uuid/tst_uuid.c    | 2 ++
 lib/uuid/unpack.c      | 1 +
 lib/uuid/unparse.c     | 1 +
 lib/uuid/uuid_time.c   | 2 ++
 12 files changed, 15 insertions(+)

(limited to 'lib/uuid')

diff --git a/lib/uuid/clear.c b/lib/uuid/clear.c
index 2d91fee9..436f8f78 100644
--- a/lib/uuid/clear.c
+++ b/lib/uuid/clear.c
@@ -32,6 +32,7 @@
  * %End-Header%
  */
 
+#include "config.h"
 #include "string.h"
 
 #include "uuidP.h"
diff --git a/lib/uuid/compare.c b/lib/uuid/compare.c
index f28a7267..d5fc5037 100644
--- a/lib/uuid/compare.c
+++ b/lib/uuid/compare.c
@@ -34,6 +34,7 @@
  * %End-Header%
  */
 
+#include "config.h"
 #include "uuidP.h"
 #include <string.h>
 
diff --git a/lib/uuid/copy.c b/lib/uuid/copy.c
index ead33aa2..32e6f502 100644
--- a/lib/uuid/copy.c
+++ b/lib/uuid/copy.c
@@ -32,6 +32,7 @@
  * %End-Header%
  */
 
+#include "config.h"
 #include "uuidP.h"
 
 void uuid_copy(uuid_t dst, const uuid_t src)
diff --git a/lib/uuid/gen_uuid.c b/lib/uuid/gen_uuid.c
index 420ca2b2..42d7563d 100644
--- a/lib/uuid/gen_uuid.c
+++ b/lib/uuid/gen_uuid.c
@@ -38,6 +38,8 @@
  */
 #define _SVID_SOURCE
 
+#include "config.h"
+
 #ifdef _WIN32
 #define _WIN32_WINNT 0x0500
 #include <windows.h>
diff --git a/lib/uuid/gen_uuid_nt.c b/lib/uuid/gen_uuid_nt.c
index aa44bfd3..79a40507 100644
--- a/lib/uuid/gen_uuid_nt.c
+++ b/lib/uuid/gen_uuid_nt.c
@@ -5,6 +5,7 @@
  */
 
 
+#include "config.h"
 #include "uuidP.h"
 
 #pragma warning(push,4)
diff --git a/lib/uuid/isnull.c b/lib/uuid/isnull.c
index 931e7e7d..170c9a20 100644
--- a/lib/uuid/isnull.c
+++ b/lib/uuid/isnull.c
@@ -32,6 +32,7 @@
  * %End-Header%
  */
 
+#include "config.h"
 #include "uuidP.h"
 
 /* Returns 1 if the uuid is the NULL uuid */
diff --git a/lib/uuid/pack.c b/lib/uuid/pack.c
index 097516d2..3db21aef 100644
--- a/lib/uuid/pack.c
+++ b/lib/uuid/pack.c
@@ -32,6 +32,7 @@
  * %End-Header%
  */
 
+#include "config.h"
 #include <string.h>
 #include "uuidP.h"
 
diff --git a/lib/uuid/parse.c b/lib/uuid/parse.c
index 074383ef..4c0857df 100644
--- a/lib/uuid/parse.c
+++ b/lib/uuid/parse.c
@@ -32,6 +32,7 @@
  * %End-Header%
  */
 
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
diff --git a/lib/uuid/tst_uuid.c b/lib/uuid/tst_uuid.c
index 7ac0207e..5884ad92 100644
--- a/lib/uuid/tst_uuid.c
+++ b/lib/uuid/tst_uuid.c
@@ -32,6 +32,8 @@
  * %End-Header%
  */
 
+#include "config.h"
+
 #ifdef _WIN32
 #define _WIN32_WINNT 0x0500
 #include <windows.h>
diff --git a/lib/uuid/unpack.c b/lib/uuid/unpack.c
index beaaff3c..2c8043df 100644
--- a/lib/uuid/unpack.c
+++ b/lib/uuid/unpack.c
@@ -32,6 +32,7 @@
  * %End-Header%
  */
 
+#include "config.h"
 #include <string.h>
 #include "uuidP.h"
 
diff --git a/lib/uuid/unparse.c b/lib/uuid/unparse.c
index a95bbb04..c556ae63 100644
--- a/lib/uuid/unparse.c
+++ b/lib/uuid/unparse.c
@@ -32,6 +32,7 @@
  * %End-Header%
  */
 
+#include "config.h"
 #include <stdio.h>
 
 #include "uuidP.h"
diff --git a/lib/uuid/uuid_time.c b/lib/uuid/uuid_time.c
index f25f5c90..4c3536b4 100644
--- a/lib/uuid/uuid_time.c
+++ b/lib/uuid/uuid_time.c
@@ -34,6 +34,8 @@
  * %End-Header%
  */
 
+#include "config.h"
+
 #ifdef _WIN32
 #define _WIN32_WINNT 0x0500
 #include <windows.h>
-- 
cgit v1.2.3