head 1.2; access; symbols netbsd-7-2-RELEASE:1.1.1.3.2.1 netbsd-7-1-2-RELEASE:1.1.1.3.2.1 netbsd-7-1-1-RELEASE:1.1.1.3.2.1 netbsd-7-1:1.1.1.3.2.1.0.4 netbsd-7-1-RELEASE:1.1.1.3.2.1 netbsd-7-1-RC2:1.1.1.3.2.1 netbsd-7-1-RC1:1.1.1.3.2.1 netbsd-7-0-2-RELEASE:1.1.1.3.2.1 netbsd-7-0-1-RELEASE:1.1.1.3.2.1 netbsd-7-0:1.1.1.3.2.1.0.2 netbsd-7-0-RELEASE:1.1.1.3.2.1 netbsd-7-0-RC3:1.1.1.3.2.1 netbsd-7-0-RC2:1.1.1.3.2.1 netbsd-7-0-RC1:1.1.1.3.2.1 netbsd-6-0-6-RELEASE:1.1.1.2 netbsd-6-1-5-RELEASE:1.1.1.2 netbsd-7:1.1.1.3.0.2 netbsd-7-base:1.1.1.3 MesaLib-7-11-2:1.1.1.3 netbsd-6-1-4-RELEASE:1.1.1.2 netbsd-6-0-5-RELEASE:1.1.1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.2 riastradh-drm2:1.1.1.2.0.8 riastradh-drm2-base:1.1.1.2 netbsd-6-1-3-RELEASE:1.1.1.2 netbsd-6-0-4-RELEASE:1.1.1.2 netbsd-6-1-2-RELEASE:1.1.1.2 netbsd-6-0-3-RELEASE:1.1.1.2 netbsd-6-1-1-RELEASE:1.1.1.2 netbsd-6-1:1.1.1.2.0.6 netbsd-6-0-2-RELEASE:1.1.1.2 netbsd-6-1-RELEASE:1.1.1.2 netbsd-6-1-RC4:1.1.1.2 netbsd-6-1-RC3:1.1.1.2 netbsd-6-1-RC2:1.1.1.2 netbsd-6-1-RC1:1.1.1.2 netbsd-6-0-1-RELEASE:1.1.1.2 netbsd-6-0:1.1.1.2.0.4 netbsd-6-0-RELEASE:1.1.1.2 netbsd-6-0-RC2:1.1.1.2 netbsd-6-0-RC1:1.1.1.2 netbsd-6:1.1.1.2.0.2 netbsd-6-base:1.1.1.2 MesaLib-7-8-2:1.1.1.2 MesaLib-7-7-1:1.1.1.1 xorg:1.1.1; locks; strict; comment @# @; 1.2 date 2014.12.18.06.11.37; author mrg; state dead; branches; next 1.1; commitid Ae59RsLlS9l0cu2y; 1.1 date 2010.05.23.21.22.33; author mrg; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2010.05.23.21.22.33; author mrg; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2010.07.19.05.31.49; author mrg; state Exp; branches; next 1.1.1.3; 1.1.1.3 date 2014.07.09.19.39.11; author riastradh; state Exp; branches 1.1.1.3.2.1; next ; commitid h96CLViPL8qdRJHx; 1.1.1.3.2.1 date 2015.01.06.09.26.24; author martin; state dead; branches; next ; commitid 2BxXkbQgg8gLEW4y; desc @@ 1.2 log @merge Mesa 10.3.5. @ text @# src/mesa/Makefile TOP = ../../../.. include $(TOP)/configs/current GALLIUM = $(TOP) ### Lists of source files, included by Makefiles VG_SOURCES = \ api_context.c \ api_filters.c \ api_images.c \ api_masks.c \ api_misc.c \ api_paint.c \ api_params.c \ api_path.c \ api_text.c \ api_transform.c \ vgu.c \ vg_context.c \ vg_state.c \ vg_tracker.c \ vg_translate.c \ polygon.c \ bezier.c \ path.c \ paint.c \ arc.c \ image.c \ renderer.c \ stroker.c \ mask.c \ shader.c \ shaders_cache.c ### All the core C sources ALL_SOURCES = \ $(VG_SOURCES) ### Object files VG_OBJECTS = \ $(VG_SOURCES:.c=.o) ### Include directories INCLUDE_DIRS = \ -I$(TOP)/include \ -I$(GALLIUM)/include \ -I$(GALLIUM)/src/gallium/include \ -I$(GALLIUM)/src/gallium/auxiliary VG_LIB = OpenVG VG_LIB_NAME = lib$(VG_LIB).so VG_MAJOR = 1 VG_MINOR = 0 VG_TINY = 0 GALLIUM_LIBS = \ $(GALLIUM)/src/gallium/auxiliary/pipebuffer/libpipebuffer.a \ $(GALLIUM)/src/gallium/auxiliary/sct/libsct.a \ $(GALLIUM)/src/gallium/auxiliary/draw/libdraw.a \ $(GALLIUM)/src/gallium/auxiliary/rtasm/librtasm.a \ $(GALLIUM)/src/gallium/auxiliary/translate/libtranslate.a \ $(GALLIUM)/src/gallium/auxiliary/cso_cache/libcso_cache.a \ $(GALLIUM)/src/gallium/auxiliary/util/libutil.a \ $(GALLIUM)/src/gallium/auxiliary/tgsi/libtgsi.a .SUFFIXES : .cpp .c.o: $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@@ .cpp.o: $(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@@ .S.o: $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@@ default: depend subdirs $(TOP)/$(LIB_DIR)/$(VG_LIB_NAME) # Make the OpenVG library $(TOP)/$(LIB_DIR)/$(VG_LIB_NAME): $(VG_OBJECTS) $(GALLIUM_LIBS) $(TOP)/bin/mklib -o $(VG_LIB) \ -major $(VG_MAJOR) \ -minor $(VG_MINOR) \ -patch $(VG_TINY) \ -install $(TOP)/$(LIB_DIR) \ $(VG_OBJECTS) $(GALLIUM_LIBS) \ -Wl,--whole-archive $(LIBS) -Wl,--no-whole-archive $(SYS_LIBS) ###################################################################### # Generic stuff depend: $(ALL_SOURCES) @@ echo "running $(MKDEP)" @@ rm -f depend # workaround oops on gutsy?!? @@ touch depend @@ $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \ > /dev/null 2>/dev/null subdirs: install: default $(INSTALL) -d $(INSTALL_DIR)/include/VG $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) $(INSTALL) -m 644 $(TOP)/include/VG/*.h $(INSTALL_DIR)/include/VG @@if [ -e $(TOP)/$(LIB_DIR)/$(VG_LIB_NAME) ]; then \ $(INSTALL) $(TOP)/$(LIB_DIR)/libOpenVG* $(INSTALL_DIR)/$(LIB_DIR); \ fi # Emacs tags tags: etags `find . -name \*.[ch]` $(TOP)/include/VG/*.h clean: -rm -f *.o -rm -f */*.o -rm -f */*/*.o -rm -f depend depend.bak include depend @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @initial import of MesaLib-7.7.1 @ text @@ 1.1.1.2 log @import Mesa 7.8.2, lib part. major changes since 7.7.1: - several new extensions for various drivers - many i965, i915 driver fixes - many glsl fixes @ text @d1 1 a1 1 # src/gallium/state_trackers/vega/Makefile d5 1 a5 7 VG_LIB = OpenVG VG_LIB_NAME = lib$(VG_LIB).so VG_MAJOR = 1 VG_MINOR = 0 VG_TINY = 0 a36 1 VG_OBJECTS = $(VG_SOURCES:.c=.o) d38 9 a46 2 VG_LIBS = $(GALLIUM_AUXILIARIES) VG_LIB_DEPS = $(EXTRA_LIB_PATH) -lm d52 3 a54 2 -I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/auxiliary d56 18 d76 1 a76 1 $(CC) -c $(INCLUDE_DIRS) $(DEFINES) $(CFLAGS) $< -o $@@ d78 8 a85 1 default: depend $(TOP)/$(LIB_DIR)/$(VG_LIB_NAME) d88 2 a89 2 $(TOP)/$(LIB_DIR)/$(VG_LIB_NAME): $(VG_OBJECTS) $(VG_LIBS) $(MKLIB) -o $(VG_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ d94 2 a95 1 $(VG_OBJECTS) $(VG_LIBS) $(VG_LIB_DEPS) d100 1 a100 1 depend: $(VG_SOURCES) d104 1 a104 1 @@ $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(VG_SOURCES) \ d107 3 d111 6 a116 4 $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/VG $(INSTALL) -m 644 $(TOP)/include/VG/*.h $(DESTDIR)$(INSTALL_DIR)/include/VG $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) $(MINSTALL) $(TOP)/$(LIB_DIR)/libOpenVG* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) d123 4 a126 2 rm -f $(VG_OBJECTS) rm -f depend depend.bak d128 1 a128 1 sinclude depend @ 1.1.1.3 log @import MesaLib 7.11.2 Brings in support for Intel Sandy Bridge and Ivy Bridge hardware, a new shader language compiler, and various other improvements too numerous to list here; see for details. @ text @d6 2 a7 1 LIBNAME = vega d9 3 a11 3 LIBRARY_INCLUDES = \ -I$(TOP)/include \ -I$(TOP)/src/mapi d13 1 a13 2 LIBRARY_DEFINES = \ -DVEGA_VERSION_STRING=\"$(MESA_VERSION)\" d15 1 a15 2 C_SOURCES = \ api.c \ d26 9 a35 2 bezier.c \ handle.c \ d37 2 a39 4 paint.c \ path.c \ polygon.c \ renderer.c \ d41 14 a54 8 shaders_cache.c \ stroker.c \ text.c \ vg_context.c \ vg_manager.c \ vg_state.c \ vg_translate.c \ vgu.c d56 2 d59 1 a59 1 GENERATED_SOURCES := api_tmp.h d61 32 a92 1 include ../../Makefile.template d94 1 a94 3 MAPI := $(TOP)/src/mapi api_tmp.h: $(MAPI)/mapi/mapi_abi.py $(MAPI)/vgapi/vgapi.csv $(PYTHON2) $< --printer vgapi --mode app $(MAPI)/vgapi/vgapi.csv > $@@ @ 1.1.1.3.2.1 log @File removals that accidently did not happen during pullup of the new MesaLib for ticket #381 @ text @@