diff options
| author | Eric Anholt <[email protected]> | 2012-06-12 12:51:32 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-06-21 10:10:46 -0700 |
| commit | 2d51ac84fd4c6d0fcf4d5112af2eb2c12e186b63 (patch) | |
| tree | 24f721124f92a5fc7cf290b10df3bf514718e0fe /src/mesa | |
| parent | 1bbd22ada0b3fb2b1ad83a6c93a5a12e2d3c26db (diff) | |
mesa: Move GL header installation to automake.
This cuts some cruft related to osmesa where we were being careful to
not install headers twice.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Makefile.am | 3 | ||||
| -rw-r--r-- | src/mesa/Makefile.old | 13 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 6a2d4252bf8..5e764cddc9f 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -21,6 +21,9 @@ SUBDIRS = x86 x86-64 . libdricore drivers +gldir = $(includedir)/GL +gl_HEADERS = $(top_srcdir)/include/GL/*.h + all-local: $(MAKE) -f Makefile.old diff --git a/src/mesa/Makefile.old b/src/mesa/Makefile.old index 7a7d651898e..b7f905c385f 100644 --- a/src/mesa/Makefile.old +++ b/src/mesa/Makefile.old @@ -122,21 +122,10 @@ depend: $(ALL_FILES) main/git_sha1.h install: default $(DRICORE_INSTALL_TARGET) @for driver in $(DRIVER_DIRS) ; do \ case "$$driver" in \ - osmesa) if [ "$(DRIVER_DIRS)" = osmesa ]; then \ - $(MAKE) -f Makefile.old install-headers install-osmesa || exit 1 ; \ - else \ - $(MAKE) -f Makefile.old install-osmesa || exit 1 ; \ - fi ;; \ - dri) $(MAKE) -f Makefile.old install-headers || exit 1 ;; \ - *) $(MAKE) -f Makefile.old install-headers || exit 1 ;; \ + osmesa) $(MAKE) -f Makefile.old install-osmesa || exit 1 ;; \ esac ; \ done -install-headers: - $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL - $(INSTALL) -m 644 $(TOP)/include/GL/*.h \ - $(DESTDIR)$(INSTALL_INC_DIR)/GL - install-osmesa: default $(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \ $(DESTDIR)$(INSTALL_LIB_DIR) |