diff options
| author | Jon TURNEY <[email protected]> | 2012-07-10 16:33:40 +0100 |
|---|---|---|
| committer | Jon TURNEY <[email protected]> | 2012-07-25 12:41:07 +0100 |
| commit | f9089f40224b8680bd5cfc2cba509d2c709cf403 (patch) | |
| tree | d116d2adb58d0795ff42c76ccdcb027b5cd9ca01 /src/mesa | |
| parent | bd4a3cce968566b639d21a6463ffdbbac83e4274 (diff) | |
Remove redundant osmesa shared library install from Makefile.old
Since osmesa now has been converted to Makefile.am, an appropriate install: rule
is generated to install the shared libary, so we no longer need to do that in
src/mesa/Makefile.old
This leaves nothing in src/mesa/Makefile.old but the tags: rule, so move that to
Makefile.am and remove Makefile.old
Also, nothing now uses OSMESA_LIB_GLOB anymore, so remove it
Signed-off-by: Jon TURNEY <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Makefile.am | 7 | ||||
| -rw-r--r-- | src/mesa/Makefile.old | 27 |
2 files changed, 4 insertions, 30 deletions
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 |