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>

15 files changed, 15 insertions, 7 deletions

diff --git a/ext2ed/Makefile.in b/ext2ed/Makefile.in
index 610635a0..b3b606a6 100644
--- a/ext2ed/Makefile.in
+++ b/ext2ed/Makefile.in
@@ -16,8 +16,7 @@ MANPAGES=	ext2ed.8
 
 DOC_DIR		=	$datadir/doc/ext2ed
 
-XTRA_CFLAGS	=	$(FLAGS) -DETC_DIR=\"$(root_sysconfdir)\" 
-LIBS		=	-lncurses
+LIBS		=	-lncurses $(LIBEXT2FS)
 
 SRCS=	$(srcdir)/main.c $(srcdir)/init.c $(srcdir)/general_com.c       \
 	$(srcdir)/inode_com.c $(srcdir)/dir_com.c $(srcdir)/super_com.c \
diff --git a/ext2ed/blockbitmap_com.c b/ext2ed/blockbitmap_com.c
index 996bbeb4..53e61dc8 100644
--- a/ext2ed/blockbitmap_com.c
+++ b/ext2ed/blockbitmap_com.c
@@ -16,6 +16,7 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ext2ed/dir_com.c b/ext2ed/dir_com.c
index b023e7a3..ba852676 100644
--- a/ext2ed/dir_com.c
+++ b/ext2ed/dir_com.c
@@ -28,6 +28,7 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ext2ed/disk.c b/ext2ed/disk.c
index 5e1cd7e2..5c243127 100644
--- a/ext2ed/disk.c
+++ b/ext2ed/disk.c
@@ -22,6 +22,7 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ext2ed/ext2_com.c b/ext2ed/ext2_com.c
index 2f20a28d..ed004f28 100644
--- a/ext2ed/ext2_com.c
+++ b/ext2ed/ext2_com.c
@@ -16,6 +16,7 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ext2ed/ext2ed.h b/ext2ed/ext2ed.h
index 2ee483e8..b9b43b47 100644
--- a/ext2ed/ext2ed.h
+++ b/ext2ed/ext2ed.h
@@ -28,10 +28,6 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
-#ifndef ETC_DIR
-#define ETC_DIR	"/etc"		/* Where to find the config file */
-#endif
-
 #define DEBUG						/* Activate self-sanity checks */
 
 #include <ext2fs/ext2_fs.h>				/* Main kernel ext2 include file */
diff --git a/ext2ed/file_com.c b/ext2ed/file_com.c
index 9772f66d..d6679599 100644
--- a/ext2ed/file_com.c
+++ b/ext2ed/file_com.c
@@ -14,6 +14,7 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ext2ed/general_com.c b/ext2ed/general_com.c
index 03dc2615..c9b2ffc4 100644
--- a/ext2ed/general_com.c
+++ b/ext2ed/general_com.c
@@ -14,6 +14,7 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ext2ed/group_com.c b/ext2ed/group_com.c
index 25325533..aaed16e4 100644
--- a/ext2ed/group_com.c
+++ b/ext2ed/group_com.c
@@ -12,6 +12,7 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ext2ed/init.c b/ext2ed/init.c
index 3815ab56..7d9b526f 100644
--- a/ext2ed/init.c
+++ b/ext2ed/init.c
@@ -14,6 +14,7 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -487,7 +488,7 @@ int process_configuration_file (void)
 	char option [80],value [80];
 	FILE *fp;
 
-	strcpy (buffer, ETC_DIR);
+	strcpy (buffer, ROOT_SYSCONFDIR);
 	strcat (buffer,"/ext2ed.conf");
 
 	if ((fp=fopen (buffer,"rt"))==NULL) {
diff --git a/ext2ed/inode_com.c b/ext2ed/inode_com.c
index 8d4b9f33..2d3dd6d6 100644
--- a/ext2ed/inode_com.c
+++ b/ext2ed/inode_com.c
@@ -12,6 +12,7 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ext2ed/inodebitmap_com.c b/ext2ed/inodebitmap_com.c
index e6022344..157807a2 100644
--- a/ext2ed/inodebitmap_com.c
+++ b/ext2ed/inodebitmap_com.c
@@ -16,6 +16,7 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ext2ed/main.c b/ext2ed/main.c
index 50a3f07f..4a29979b 100644
--- a/ext2ed/main.c
+++ b/ext2ed/main.c
@@ -22,6 +22,7 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ext2ed/super_com.c b/ext2ed/super_com.c
index 57953ab6..a998970e 100644
--- a/ext2ed/super_com.c
+++ b/ext2ed/super_com.c
@@ -14,6 +14,7 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ext2ed/win.c b/ext2ed/win.c
index 113a28f3..23d0da13 100644
--- a/ext2ed/win.c
+++ b/ext2ed/win.c
@@ -17,6 +17,7 @@ Copyright (C) 1995 Gadi Oxman
 
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>