[build] fix srcdir != builddir mistakes

When configure is run from a directory other than the source directory, various files fail to compile because the include paths use $(builddir) or $(top_builddir) when the source is actually in $(srcdir) or $(top_srcdir). Signed-off-by: Aaron Plattner <[email protected]>
flymj · Sep 26, 2013 · debae59 · debae59
1 parent 4ecfeb2
commit debae59
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 20 deletions.
diff --git a/src/GL/Makefile.am b/src/GL/Makefile.am
@@ -41,7 +41,7 @@ glapitemp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
  $(call glapi_gen_mapi,$<,noop-gl)
 
 libGL_la_CFLAGS = \
- -I$(top_builddir)/include
+ -I$(top_srcdir)/include
 
 libGL_la_LDFLAGS = -shared -Wl,--auxiliary=libGLdispatch.so.0 -Wl,--auxiliary=libGLX.so.0
 

diff --git a/src/GLX/Makefile.am b/src/GLX/Makefile.am
@@ -36,13 +36,13 @@ X11GLVND_DIR = ../x11glvnd
 
 # Warning settings
 # Include paths
-libGLX_la_CFLAGS = -I$(UTHASH_DIR)
-libGLX_la_CFLAGS += -I$(UTIL_DIR)
-libGLX_la_CFLAGS += -I$(TRACE_DIR)
-libGLX_la_CFLAGS += -I$(GLVND_PTHREAD_DIR)
-libGLX_la_CFLAGS += -I$(GL_DISPATCH_DIR)
-libGLX_la_CFLAGS += -I$(top_builddir)/include
-libGLX_la_CFLAGS += -I$(X11GLVND_DIR)
+libGLX_la_CFLAGS =  -I$(srcdir)/$(UTHASH_DIR)
+libGLX_la_CFLAGS += -I$(srcdir)/$(UTIL_DIR)
+libGLX_la_CFLAGS += -I$(srcdir)/$(TRACE_DIR)
+libGLX_la_CFLAGS += -I$(srcdir)/$(GLVND_PTHREAD_DIR)
+libGLX_la_CFLAGS += -I$(srcdir)/$(GL_DISPATCH_DIR)
+libGLX_la_CFLAGS += -I$(top_srcdir)/include
+libGLX_la_CFLAGS += -I$(srcdir)/$(X11GLVND_DIR)
 
 # Required library flags
 libGLX_la_CFLAGS += $(PTHREAD_CFLAGS)

diff --git a/src/GLdispatch/Makefile.am b/src/GLdispatch/Makefile.am
@@ -29,11 +29,11 @@ lib_LTLIBRARIES = libGLdispatch.la
 
 SUBDIRS = mapi/vnd-glapi
 
-libGLdispatch_la_CFLAGS = -Imapi/glapi
-libGLdispatch_la_CFLAGS += -I../util/trace
-libGLdispatch_la_CFLAGS += -I../util/glvnd_pthread
-libGLdispatch_la_CFLAGS += -Imapi
-libGLdispatch_la_CFLAGS += -I$(top_builddir)/include
+libGLdispatch_la_CFLAGS = -I$(srcdir)/mapi/glapi
+libGLdispatch_la_CFLAGS += -I$(top_srcdir)/src/util/trace
+libGLdispatch_la_CFLAGS += -I$(top_srcdir)/src/util/glvnd_pthread
+libGLdispatch_la_CFLAGS += -I$(srcdir)/mapi
+libGLdispatch_la_CFLAGS += -I$(top_srcdir)/include
 
 libGLdispatch_la_LDFLAGS = -shared
 

diff --git a/src/GLdispatch/mapi/vnd-glapi/Makefile.am b/src/GLdispatch/mapi/vnd-glapi/Makefile.am
@@ -31,7 +31,7 @@ AM_CPPFLAGS = \
  -I$(top_srcdir)/include \
  -I$(top_srcdir)/$(MAPI_PREFIX) \
  -I$(top_builddir)/$(MAPI_PREFIX) \
- -I$(top_builddir)/$(MAPI_PREFIX)/glapi \
+ -I$(top_srcdir)/$(MAPI_PREFIX)/glapi \
  -I$(top_srcdir)/$(MAPI_MESA_PREFIX) \
  -DMAPI_MODE_GLAPI \
  -DMAPI_ABI_HEADER=\"vnd-glapi/glapi_mapi_tmp.h\"
diff --git a/src/util/glvnd_pthread/Makefile.am b/src/util/glvnd_pthread/Makefile.am
@@ -30,6 +30,6 @@
 noinst_LTLIBRARIES = libglvnd_pthread.la
 
 libglvnd_pthread_la_LIBADD = -ldl
-libglvnd_pthread_la_CFLAGS = -I../trace/
+libglvnd_pthread_la_CFLAGS = -I$(top_srcdir)/src/util/trace/
 libglvnd_pthread_la_SOURCES = \
  glvnd_pthread.c
diff --git a/tests/GLX_dummy/Makefile.am b/tests/GLX_dummy/Makefile.am
@@ -9,13 +9,12 @@ libGLX_dummy_copy : libGLX_dummy.la
  cp .libs/libGLX_dummy.so.0.0.0 .libs/libGLX_dummy_0.so.0
  cp .libs/libGLX_dummy.so.0.0.0 .libs/libGLX_dummy_1.so.0
 
-GLX_ABI_DIR = $(top_builddir)/src/GLX
 
 libGLX_dummy_la_CFLAGS = \
- -I$(GLX_ABI_DIR)  \
- -I$(top_builddir)/src/util \
- -I$(top_builddir)/src/util/trace \
- -I$(top_builddir)/include \
+ -I$(top_srcdir)/src/GLX \
+ -I$(top_srcdir)/src/util \
+ -I$(top_srcdir)/src/util/trace \
+ -I$(top_srcdir)/include \
  -Wno-error=unused-function
 libGLX_dummy_la_SOURCES = GLX_dummy.c
 libGLX_dummy_la_LIBADD = $(top_builddir)/src/util/trace/libtrace.la