diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-08-31 18:54:52 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-08-31 18:54:52 +0000 |
| commit | 1c5ff572aaaf533377f91dbd4bcd4411d855fabc (patch) | |
| tree | d7bf7bb267e6c357e1bdf321e7a5ebef748905ad | |
| parent | bd7a3de4b35f8bb1a1ea033ba2893315a4efcc29 (diff) | |
added program.c plus minor fixes
| -rw-r--r-- | src/mesa/Makefile.DJ | 1 | ||||
| -rw-r--r-- | src/mesa/Makefile.X11 | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/mesa/Makefile.DJ b/src/mesa/Makefile.DJ index a1b11d949b..b375c05b61 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 d014936d36..9f3377e8b7 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 |