diff options
| -rw-r--r-- | configs/current.in | 1 | ||||
| -rw-r--r-- | configs/default | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/mesa/Makefile.am | 7 | ||||
| -rw-r--r-- | src/mesa/Makefile.old | 27 |
5 files changed, 4 insertions, 34 deletions
diff --git a/configs/current.in b/configs/current.in index dc0dea8359f..9785a5a9cd3 100644 --- a/configs/current.in +++ b/configs/current.in @@ -99,7 +99,6 @@ GLAPI_LIB_NAME = @GLAPI_LIB_NAME@ GL_LIB_GLOB = @GL_LIB_GLOB@ GLU_LIB_GLOB = @GLU_LIB_GLOB@ GLW_LIB_GLOB = @GLW_LIB_GLOB@ -OSMESA_LIB_GLOB = @OSMESA_LIB_GLOB@ EGL_LIB_GLOB = @EGL_LIB_GLOB@ GLESv1_CM_LIB_GLOB = @GLESv1_CM_LIB_GLOB@ GLESv2_LIB_GLOB = @GLESv2_LIB_GLOB@ diff --git a/configs/default b/configs/default index 734b2f62e89..8a8d8f8d209 100644 --- a/configs/default +++ b/configs/default @@ -76,7 +76,6 @@ GLAPI_LIB_NAME = lib$(GLAPI_LIB).so GL_LIB_GLOB = $(GL_LIB_NAME)* GLU_LIB_GLOB = $(GLU_LIB_NAME)* GLW_LIB_GLOB = $(GLW_LIB_NAME)* -OSMESA_LIB_GLOB = $(OSMESA_LIB_NAME)* EGL_LIB_GLOB = $(EGL_LIB_NAME)* GLESv1_CM_LIB_GLOB = $(GLESv1_CM_LIB_NAME)* GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)* diff --git a/configure.ac b/configure.ac index 833a9403985..d9fc29cb9fe 100644 --- a/configure.ac +++ b/configure.ac @@ -416,7 +416,6 @@ GLAPI_LIB_NAME='lib$(GLAPI_LIB).'${LIB_EXTENSION} GL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' GLU_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLU_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' -OSMESA_LIB_GLOB=${LIB_PREFIX_GLOB}'$(OSMESA_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' GLESv1_CM_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv1_CM_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' @@ -435,7 +434,6 @@ AC_SUBST([GLAPI_LIB_NAME]) AC_SUBST([GL_LIB_GLOB]) AC_SUBST([GLU_LIB_GLOB]) -AC_SUBST([OSMESA_LIB_GLOB]) AC_SUBST([EGL_LIB_GLOB]) AC_SUBST([GLESv1_CM_LIB_GLOB]) AC_SUBST([GLESv2_LIB_GLOB]) diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 2b023d7279a..94fe4998538 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -131,9 +131,6 @@ libmesagallium_la_SOURCES = \ libmesagallium_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la libmesagallium_la_LDFLAGS = -install-exec-local: - $(MAKE) -f $(srcdir)/Makefile.old install - # Provide compatibility with scripts for the old Mesa build system for # a while by putting a link to the library in the current directory. all-local: libmesa.la libmesagallium.la @@ -149,3 +146,7 @@ pkgconfig_DATA = osmesa.pc else pkgconfig_DATA = gl.pc endif + +# Emacs tags +tags: + etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h diff --git a/src/mesa/Makefile.old b/src/mesa/Makefile.old deleted file mode 100644 index 3266a5de085..00000000000 --- a/src/mesa/Makefile.old +++ /dev/null @@ -1,27 +0,0 @@ -# src/mesa/Makefile - -TOP = ../.. -include $(TOP)/configs/current - -SRCDIR = . -include sources.mak - -default: - -###################################################################### -# Installation rules - -install: default $(DRICORE_INSTALL_TARGET) - @for driver in $(DRIVER_DIRS) ; do \ - case "$$driver" in \ - osmesa) $(MAKE) -f Makefile.old install-osmesa || exit 1 ;; \ - esac ; \ - done - -install-osmesa: default - $(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \ - $(DESTDIR)$(INSTALL_LIB_DIR) - -# Emacs tags -tags: - etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h |