diff options
author | Matt Turner <[email protected]> | 2012-01-24 11:34:42 -0500 |
---|---|---|
committer | Matt Turner <[email protected]> | 2012-01-24 11:34:42 -0500 |
commit | 027ce0c493a85c863df88b43f61aea34bcd4cd58 (patch) | |
tree | f845bb4ce46ffe9dfa3e77ed88f51d4e354ade96 /src/mapi/glapi/Makefile | |
parent | a208468e04353239f2876cc2013f860b48a4f1c1 (diff) |
Revert "Always build shared glapi"
This reverts commit adefee50d954151f76150af80207081ae3c247d9.
Shared glapi was never tested with --enable-xlib-glx and turns out
to cause a lot of problems.
Conflicts:
configure.ac
Diffstat (limited to 'src/mapi/glapi/Makefile')
-rw-r--r-- | src/mapi/glapi/Makefile | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/mapi/glapi/Makefile b/src/mapi/glapi/Makefile index 37b178eee39..bb4ed6585d9 100644 --- a/src/mapi/glapi/Makefile +++ b/src/mapi/glapi/Makefile @@ -15,6 +15,7 @@ glapi_CPPFLAGS := \ -I$(TOP)/src/mapi \ -I$(TOP)/src/mesa +ifeq ($(SHARED_GLAPI),1) glapi_CPPFLAGS += \ -DMAPI_MODE_BRIDGE \ -DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\" @@ -23,6 +24,14 @@ glapi_SOURCES := $(addprefix $(MAPI)/, $(MAPI_BRIDGE_SOURCES)) glapi_GLAPI_OBJECTS := glapi_ASM_OBJECTS := glapi_MAPI_OBJECTS := $(MAPI_BRIDGE_SOURCES:.c=.o) +else +glapi_CPPFLAGS += -DMAPI_MODE_UTIL +glapi_SOURCES := $(GLAPI_SOURCES) $(addprefix $(MAPI)/, $(MAPI_UTIL_SOURCES)) + +glapi_GLAPI_OBJECTS := $(GLAPI_SOURCES:.c=.o) +glapi_ASM_OBJECTS := $(GLAPI_ASM_SOURCES:.S=.o) +glapi_MAPI_OBJECTS := $(MAPI_UTIL_SOURCES:.c=.o) +endif # SHARED_GLAPI glapi_OBJECTS := \ $(glapi_GLAPI_OBJECTS) \ @@ -50,10 +59,14 @@ clean: -rm -f lib$(TARGET).a -rm -f depend depend.bak +ifeq ($(SHARED_GLAPI),1) # workaround a bug in makedepend makedepend_CPPFLAGS := \ $(filter-out -DMAPI_ABI_HEADER=%, $(glapi_CPPFLAGS)) $(glapi_OBJECTS): glapi_mapi_tmp.h +else +makedepend_CPPFLAGS := $(glapi_CPPFLAGS) +endif depend: $(glapi_SOURCES) @ echo "running $(MKDEP)" |