[Mesa-dev] [PATCH] egl/main: use separate LIBEGL_C_FILES and LIBEGL_H_FILES to fix SCons build

Brian Paul brianp at vmware.com
Thu Aug 14 07:38:03 PDT 2014


The linker was trying to process .h files and failing.
---
 src/egl/main/Makefile.am      |    3 ++-
 src/egl/main/Makefile.sources |   36 ++++++++++++++++++++----------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
index 6746bcc..06f6a05 100644
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
@@ -34,7 +34,8 @@ AM_CFLAGS = \
 lib_LTLIBRARIES = libEGL.la
 
 libEGL_la_SOURCES = \
-	${LIBEGL_C_FILES}
+	${LIBEGL_C_FILES} \
+	${LIBEGL_H_FILES}
 
 libEGL_la_LIBADD = \
 	$(EGL_LIB_DEPS)
diff --git a/src/egl/main/Makefile.sources b/src/egl/main/Makefile.sources
index 6a917e2..3573004 100644
--- a/src/egl/main/Makefile.sources
+++ b/src/egl/main/Makefile.sources
@@ -1,38 +1,42 @@
 LIBEGL_C_FILES := \
 	eglapi.c \
-	eglapi.h \
 	eglarray.c \
+	eglconfig.c \
+	eglcontext.c \
+	eglcurrent.c \
+	egldisplay.c \
+	egldriver.c \
+	eglfallbacks.c \
+	eglglobals.c \
+	eglimage.c \
+	egllog.c \
+	eglmisc.c \
+	eglmode.c \
+	eglscreen.c \
+	eglstring.c \
+	eglsurface.c \
+	eglsync.c
+
+
+LIBEGL_H_FILES := \
+	eglapi.h \
 	eglarray.h \
 	eglcompiler.h \
-	eglconfig.c \
 	eglconfig.h \
-	eglcontext.c \
 	eglcontext.h \
-	eglcurrent.c \
 	eglcurrent.h \
 	egldefines.h \
-	egldisplay.c \
 	egldisplay.h \
-	egldriver.c \
 	egldriver.h \
-	eglfallbacks.c \
-	eglglobals.c \
 	eglglobals.h \
-	eglimage.c \
 	eglimage.h \
-	egllog.c \
 	egllog.h \
-	eglmisc.c \
 	eglmisc.h \
-	eglmode.c \
 	eglmode.h \
 	eglmutex.h \
-	eglscreen.c \
 	eglscreen.h \
-	eglstring.c \
 	eglstring.h \
-	eglsurface.c \
 	eglsurface.h \
-	eglsync.c \
 	eglsync.h \
 	egltypedefs.h
+
-- 
1.7.10.4



More information about the mesa-dev mailing list