nv50: switch nv50_transfer.c to g80_defs.xml.h

[mesa.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 75e2a739cfca1a6b5b2ce22e77e51f42ae71a155..9b23cf58f4ff96b0c555fa0d93b11a5952c459f3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,22 +19,23 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = gtest loader mapi
+SUBDIRS = . gtest util mapi/glapi/gen mapi
+
+# include only conditionally ?
+SUBDIRS += compiler
 
 if NEED_OPENGL_COMMON
-SUBDIRS += glsl mesa
+SUBDIRS += mesa
 endif
 
+SUBDIRS += loader
+
 if HAVE_DRI_GLX
 SUBDIRS += glx
 endif
 
 if HAVE_EGL_PLATFORM_WAYLAND
-SUBDIRS += egl/wayland
-endif
-
-if HAVE_EGL_DRIVER_DRI2
-SUBDIRS += egl/drivers/dri2
+SUBDIRS += egl/wayland/wayland-egl egl/wayland/wayland-drm
 endif
 
 if HAVE_GBM
@@ -42,20 +43,29 @@ SUBDIRS += gbm
 endif
 
 if HAVE_EGL
-SUBDIRS += egl/main
+SUBDIRS += egl
 endif
 
 if HAVE_GALLIUM
-SUBDIRS +=                     \
-       gallium/auxiliary       \
-       gallium/drivers         \
-       gallium/state_trackers  \
-       gallium/winsys          \
-       gallium/targets
-
-if HAVE_GALLIUM_TESTS
-SUBDIRS +=                     \
-       gallium/tests/trivial   \
-       gallium/tests/unit
-endif
+SUBDIRS += gallium
 endif
+
+EXTRA_DIST = \
+       getopt hgl SConscript
+
+AM_CFLAGS = $(VISIBILITY_CFLAGS)
+AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
+
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/include/ \
+       -I$(top_srcdir)/src/mapi/ \
+       -I$(top_srcdir)/src/mesa/ \
+       $(DEFINES)
+
+noinst_LTLIBRARIES = libglsl_util.la
+
+libglsl_util_la_SOURCES = \
+       mesa/main/imports.c \
+       mesa/program/prog_hash_table.c \
+       mesa/program/symbol_table.c \
+       mesa/program/dummy_errors.c