diff options
| author | Matt Turner <mattst88@gmail.com> | 2012-09-05 21:08:39 -0700 |
|---|---|---|
| committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2013-01-13 00:55:37 +0100 |
| commit | 92ce9c38fd5e2260ca2a707548c4de13a6002a1b (patch) | |
| tree | 9896c99928b93d2c1eee28bc09b1a97907ce85c8 /src/mapi | |
| parent | 8c80bdc4a8d0b1c39cad8b8bfb1b982a498f0a8e (diff) | |
Remove hacks for static Makefiles
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- don't remove compatibility with scripts for the old build system
v3: Andreas Boll <andreas.boll.dev@gmail.com>
- remove more obsolete hacks
v4: Andreas Boll <andreas.boll.dev@gmail.com>
- add a previously removed TOP variable to fix vgapi build
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/glapi/Makefile.am | 9 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/Makefile.am | 11 | ||||
| -rw-r--r-- | src/mapi/vgapi/Makefile.am | 3 |
3 files changed, 5 insertions, 18 deletions
diff --git a/src/mapi/glapi/Makefile.am b/src/mapi/glapi/Makefile.am index 181a28a7c2f..bdb527d5c5c 100644 --- a/src/mapi/glapi/Makefile.am +++ b/src/mapi/glapi/Makefile.am @@ -58,12 +58,3 @@ endif noinst_LTLIBRARIES = libglapi.la libglapi_la_SOURCES = $(glapi_GLAPI_sources) $(glapi_ASM_sources) $(glapi_MAPI_sources) -libglapi_la_LIBADD = -libglapi_la_LDFLAGS = - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to libglapi.a here -all-local: libglapi.la - ln -sf .libs/libglapi.a libglapi.a - -CLEANFILES = libglapi.a diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index ff22c8e0d91..46b2127a4ad 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -3,9 +3,6 @@ # Instead, when the Mesa developers update/change the API interface it's # up to him/her to re-run this makefile and check in the newly generated files. - -TOP = ../../../.. - # These are the "official" xserver indent flags from utils/modular/x-indent.sh XORG_INDENT_FLAGS = -linux -bad -bap -blf -bli0 -cbi0 -cdw -nce -cs -i4 -lc80 -psl -nbbo \ -nbc -psl -nbfda -nut -nss -T pointer -T ScreenPtr -T ScrnInfoPtr -T pointer \ @@ -26,10 +23,10 @@ XORG_INDENT_FLAGS = -linux -bad -bap -blf -bli0 -cbi0 -cdw -nce -cs -i4 -lc80 -p -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT -MESA_DIR = $(TOP)/src/mesa -MESA_GLAPI_DIR = $(TOP)/src/mapi/glapi -MESA_MAPI_DIR = $(TOP)/src/mapi/mapi -MESA_GLX_DIR = $(TOP)/src/glx +MESA_DIR = $(top_srcdir)/src/mesa +MESA_GLAPI_DIR = $(top_srcdir)/src/mapi/glapi +MESA_MAPI_DIR = $(top_srcdir)/src/mapi/mapi +MESA_GLX_DIR = $(top_srcdir)/src/glx MESA_GLAPI_OUTPUTS = \ $(MESA_GLAPI_DIR)/glapi_mapi_tmp.h \ diff --git a/src/mapi/vgapi/Makefile.am b/src/mapi/vgapi/Makefile.am index 47875ed8bb5..b7abf92a1cc 100644 --- a/src/mapi/vgapi/Makefile.am +++ b/src/mapi/vgapi/Makefile.am @@ -19,8 +19,6 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -TOP=$(top_srcdir) - AM_CPPFLAGS = \ $(DEFINES) \ -I$(top_srcdir)/include \ @@ -41,6 +39,7 @@ VG_include_HEADERS = \ lib_LTLIBRARIES = libOpenVG.la +TOP=$(top_srcdir) include ../mapi/sources.mak libOpenVG_la_SOURCES = $(MAPI_FILES) vgapi_tmp.h libOpenVG_la_LIBADD = $(VG_LIB_DEPS) |