From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sun, 31 Aug 2003 18:54:52 +0000 (+0000)
Subject: added program.c plus minor fixes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1c5ff572aaaf533377f91dbd4bcd4411d855fabc;p=mesa.git

added program.c plus minor fixes
---

diff --git a/src/mesa/Makefile.DJ b/src/mesa/Makefile.DJ
index a1b11d949be..b375c05b618 100644
--- a/src/mesa/Makefile.DJ
+++ b/src/mesa/Makefile.DJ
@@ -144,6 +144,7 @@ MAIN_SOURCES = \
 	main/pixel.c \
 	main/points.c \
 	main/polygon.c \
+	main/program.c \
 	main/rastpos.c \
 	main/state.c \
 	main/stencil.c \
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index d014936d366..9f3377e8b73 100644
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -64,6 +64,7 @@ MAIN_SOURCES = \
 	main/pixel.c \
 	main/points.c \
 	main/polygon.c \
+	main/program.c \
 	main/rastpos.c \
 	main/state.c \
 	main/stencil.c \
@@ -313,6 +314,7 @@ $(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS)
 		-L$(LIBDIR) -l$(GL_LIB_NAME) -install $(LIBDIR) \
 		$(OSMESA_OBJECTS) ; fi
 
+
 # Make an optional library with _just_ core objects
 libmesa: $(LIBDIR)/$(MESA_LIB)
 	if [ ${MESA_LIB} ] ; then $(MAKELIB) $(MESA_LIB) $(MESA_MAJOR) $(MESA_MINOR) $(GL_TINY) $(CORE_OBJECTS) ; fi
@@ -323,12 +325,14 @@ $(LIBDIR)/$(MESA_LIB):	$(CORE_OBJECTS)
 
 mesa.a:	$(CORE_OBJECTS)
 	rm -f $@ && ar rcv $@ $(CORE_OBJECTS) && ranlib $@
-  
+
+
 # Run 'make -f Makefile.X11 dep' to update the dependencies if you change
 # what's included by any source file.
 dep: $(CORE_SOURCES) $(DRIVER_SOURCES) $(OSMESA_DRIVER_SOURCES) $(ASM_SOURCES)
-	makedepend -fdepend -Y -I../include -DGGI -DSVGA -DFX $(CORE_SOURCES) \
-		$(DRIVER_SOURCES) $(OSMESA_DRIVER_SOURCES) $(ASM_SOURCES)
+	makedepend -fdepend -Y $(INCLUDE_DIRS) -DGGI -DSVGA -DFX \
+		$(CORE_SOURCES) $(DRIVER_SOURCES) $(OSMESA_DRIVER_SOURCES) \
+		$(ASM_SOURCES)
 
 
 # Emacs tags