Small build fixes for e.

[Tomislav Vujec <tvujec CARNet hr>]

Hi!

Here is the patch for enlightenment, to build in $(srcdir) !=
$(builddir). Please apply it to CVS tree.

P.S. Little advice:
- never use ../ in include cpp directive
- put $(top_srcdir) in INCLUDES for distributed headers in top directory
- put $(top_builddir) in INCLUDES for generated headers in top directory
- use $(top_srcdir)/subdir and $(top_builddir)/subdir respectively

Regards,
Tomislav
? i386
Index: dox/Makefile.am
===================================================================
RCS file: /cvs/gnome/e/dox/Makefile.am,v
retrieving revision 1.15
diff -u -r1.15 Makefile.am
--- dox/Makefile.am	1999/04/06 02:37:04	1.15
+++ dox/Makefile.am	1999/04/15 00:13:33
@@ -31,7 +31,7 @@
 
 LDADD = $(TTF_LIBS) $(FNLIB_LIBS) $(IMLIB_LIBS) -lm
 
-INCLUDES=-I$(top_srcdir) $(IMLIB_CFLAGS) -I$(includedir)
+INCLUDES=-I$(top_builddir) $(IMLIB_CFLAGS) -I$(includedir)
 
 DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\"
 
Index: dox/dox.c
===================================================================
RCS file: /cvs/gnome/e/dox/dox.c,v
retrieving revision 1.20
diff -u -r1.20 dox.c
--- dox/dox.c	1999/03/12 17:43:41	1.20
+++ dox/dox.c	1999/04/15 00:13:46
@@ -1,7 +1,5 @@
 /* DOX for Enlightenment - by The Rasterman (C) 1998 */
 
-#include "../econfig.h"
-
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xosdefs.h>
@@ -15,8 +13,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-
-#include "econfig.h"
 
 #include "dox.h"
 
Index: dox/dox.h
===================================================================
RCS file: /cvs/gnome/e/dox/dox.h,v
retrieving revision 1.1
diff -u -r1.1 dox.h
--- dox/dox.h	1999/03/10 23:03:54	1.1
+++ dox/dox.h	1999/04/15 00:13:46
@@ -19,7 +19,7 @@
 /* Boston, MA 02111-1307, USA.                                               */
 /*****************************************************************************/
 
-#include "../econfig.h"
+#include "econfig.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
Index: eesh/E.h
===================================================================
RCS file: /cvs/gnome/e/eesh/E.h,v
retrieving revision 1.11
diff -u -r1.11 E.h
--- eesh/E.h	1999/03/11 20:19:47	1.11
+++ eesh/E.h	1999/04/15 00:13:51
@@ -11,8 +11,6 @@
 /* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                      */
 /*****************************************************************************/ 
 
-#include "../econfig.h"
-
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xproto.h>
Index: eesh/Makefile.am
===================================================================
RCS file: /cvs/gnome/e/eesh/Makefile.am,v
retrieving revision 1.14
diff -u -r1.14 Makefile.am
--- eesh/Makefile.am	1999/04/06 02:37:07	1.14
+++ eesh/Makefile.am	1999/04/15 00:13:51
@@ -21,7 +21,7 @@
 
 LDADD = $(X_PRE_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) -lm
 
-INCLUDES=-I$(top_srcdir) $(IMLIB_CFLAGS) -I$(includedir)
+INCLUDES=-I$(top_builddir) $(IMLIB_CFLAGS) -I$(includedir)
 
 DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\"
 
Index: epp/Makefile.am
===================================================================
RCS file: /cvs/gnome/e/epp/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- epp/Makefile.am	1999/04/06 02:37:09	1.5
+++ epp/Makefile.am	1999/04/15 00:13:51
@@ -36,7 +36,7 @@
 	cpplib.c \
 	cppmain.c 
 
-INCLUDES=-I$(top_srcdir) -I$(includedir)
+INCLUDES=-I$(top_builddir) -I$(includedir)
 
 DEFS= \
 -DHAVE_STRERROR \
Index: epp/cpplib.c
===================================================================
RCS file: /cvs/gnome/e/epp/cpplib.c,v
retrieving revision 1.11
diff -u -r1.11 cpplib.c
--- epp/cpplib.c	1999/03/22 08:50:06	1.11
+++ epp/cpplib.c	1999/04/15 00:15:06
@@ -24,7 +24,7 @@
 
 char               *version_string = "0.0.0";
 
-#include "../econfig.h"
+#include "econfig.h"
 
 #ifndef STANDARD_INCLUDE_DIR
 #define STANDARD_INCLUDE_DIR "/usr/include"
Index: src/E.h
===================================================================
RCS file: /cvs/gnome/e/src/E.h,v
retrieving revision 1.267
diff -u -r1.267 E.h
--- src/E.h	1999/04/12 15:46:15	1.267
+++ src/E.h	1999/04/15 00:15:29
@@ -11,8 +11,6 @@
 /* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                      */
 /*****************************************************************************/
 
-#include "../econfig.h"
-
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xproto.h>
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/e/src/Makefile.am,v
retrieving revision 1.74
diff -u -r1.74 Makefile.am
--- src/Makefile.am	1999/04/12 15:46:16	1.74
+++ src/Makefile.am	1999/04/15 00:15:29
@@ -96,7 +96,7 @@
 	$(GHTTP_LIBS)           \
 	-lm
 
-INCLUDES=-I$(top_srcdir) $(ESD_CFLAGS) $(IMLIB_CFLAGS) -I$(includedir)
+INCLUDES=-I$(top_builddir) $(ESD_CFLAGS) $(IMLIB_CFLAGS) -I$(includedir)
 
 DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\"