head 1.2; access; symbols netbsd-7-2-RELEASE:1.1.1.4.2.1 netbsd-7-1-2-RELEASE:1.1.1.4.2.1 netbsd-7-1-1-RELEASE:1.1.1.4.2.1 netbsd-7-1:1.1.1.4.2.1.0.4 netbsd-7-1-RELEASE:1.1.1.4.2.1 netbsd-7-1-RC2:1.1.1.4.2.1 netbsd-7-1-RC1:1.1.1.4.2.1 netbsd-7-0-2-RELEASE:1.1.1.4.2.1 netbsd-7-0-1-RELEASE:1.1.1.4.2.1 netbsd-7-0:1.1.1.4.2.1.0.2 netbsd-7-0-RELEASE:1.1.1.4.2.1 netbsd-7-0-RC3:1.1.1.4.2.1 netbsd-7-0-RC2:1.1.1.4.2.1 netbsd-7-0-RC1:1.1.1.4.2.1 netbsd-5-2-3-RELEASE:1.1.1.1.2.1 netbsd-5-1-5-RELEASE:1.1.1.1.2.1 netbsd-6-0-6-RELEASE:1.1.1.3 netbsd-6-1-5-RELEASE:1.1.1.3 netbsd-7:1.1.1.4.0.2 netbsd-7-base:1.1.1.4 MesaLib-7-11-2:1.1.1.4 netbsd-6-1-4-RELEASE:1.1.1.3 netbsd-6-0-5-RELEASE:1.1.1.3 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.3 riastradh-drm2:1.1.1.3.0.8 riastradh-drm2-base:1.1.1.3 netbsd-6-1-3-RELEASE:1.1.1.3 netbsd-6-0-4-RELEASE:1.1.1.3 netbsd-5-2-2-RELEASE:1.1.1.1.2.1 netbsd-5-1-4-RELEASE:1.1.1.1.2.1 netbsd-6-1-2-RELEASE:1.1.1.3 netbsd-6-0-3-RELEASE:1.1.1.3 netbsd-5-2-1-RELEASE:1.1.1.1.2.1 netbsd-5-1-3-RELEASE:1.1.1.1.2.1 netbsd-6-1-1-RELEASE:1.1.1.3 netbsd-6-1:1.1.1.3.0.6 netbsd-6-0-2-RELEASE:1.1.1.3 netbsd-6-1-RELEASE:1.1.1.3 netbsd-6-1-RC4:1.1.1.3 netbsd-6-1-RC3:1.1.1.3 netbsd-6-1-RC2:1.1.1.3 netbsd-6-1-RC1:1.1.1.3 netbsd-5-2:1.1.1.1.2.1.0.4 netbsd-6-0-1-RELEASE:1.1.1.3 netbsd-5-2-RELEASE:1.1.1.1.2.1 netbsd-5-2-RC1:1.1.1.1.2.1 netbsd-6-0:1.1.1.3.0.4 netbsd-6-0-RELEASE:1.1.1.3 netbsd-6-0-RC2:1.1.1.3 netbsd-6-0-RC1:1.1.1.3 netbsd-6:1.1.1.3.0.2 netbsd-6-base:1.1.1.3 netbsd-5-1-2-RELEASE:1.1.1.1.2.1 netbsd-5-1-1-RELEASE:1.1.1.1.2.1 netbsd-5-1:1.1.1.1.2.1.0.2 netbsd-5-1-RELEASE:1.1.1.1.2.1 netbsd-5-1-RC4:1.1.1.1.2.1 MesaLib-7-8-2:1.1.1.3 netbsd-5-1-RC3:1.1.1.1.2.1 MesaLib-7-7-1:1.1.1.3 netbsd-5-1-RC2:1.1.1.1.2.1 netbsd-5-1-RC1:1.1.1.1.2.1 netbsd-5-0-2-RELEASE:1.1.1.1 MesaLib-7-4-4:1.1.1.2 netbsd-5-0-1-RELEASE:1.1.1.1 MesaLib-7-4-2:1.1.1.2 netbsd-5-0:1.1.1.1.0.4 netbsd-5-0-RELEASE:1.1.1.1 netbsd-5-0-RC4:1.1.1.1 netbsd-5-0-RC3:1.1.1.1 netbsd-5-0-RC2:1.1.1.1 netbsd-5-0-RC1:1.1.1.1 netbsd-5:1.1.1.1.0.2 netbsd-5-base:1.1.1.1 MesaLib-7-0-3:1.1.1.1 xorg:1.1.1; locks; strict; comment @# @; 1.2 date 2014.12.18.06.11.42; author mrg; state dead; branches; next 1.1; commitid Ae59RsLlS9l0cu2y; 1.1 date 2008.07.29.05.10.46; author mrg; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2008.07.29.05.10.46; author mrg; state Exp; branches 1.1.1.1.2.1; next 1.1.1.2; 1.1.1.2 date 2009.06.11.00.50.22; author mrg; state Exp; branches; next 1.1.1.3; 1.1.1.3 date 2010.05.23.21.22.36; author mrg; state Exp; branches; next 1.1.1.4; 1.1.1.4 date 2014.07.09.19.39.16; author riastradh; state Exp; branches 1.1.1.4.2.1; next ; commitid h96CLViPL8qdRJHx; 1.1.1.1.2.1 date 2009.09.17.03.32.09; author snj; state Exp; branches; next ; 1.1.1.4.2.1 date 2015.01.06.09.26.29; author martin; state dead; branches; next ; commitid 2BxXkbQgg8gLEW4y; desc @@ 1.2 log @merge Mesa 10.3.5. @ text @# src/glw/Makefile TOP = ../.. include $(TOP)/configs/current MAJOR = 1 MINOR = 0 TINY = 0 INCDIRS = -I$(TOP)/include -I/usr/include/Motif1.2 $(X11_INCLUDES) OBJECTS = $(GLW_SOURCES:.c=.o) ##### RULES ##### .c.o: $(CC) -c $(INCDIRS) $(CFLAGS) $< ##### TARGETS ##### default: $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME) # GLU pkg-config file pcedit = sed \ -e 's,@@INSTALL_DIR@@,$(INSTALL_DIR),' \ -e 's,@@LIB_DIR@@,$(LIB_DIR),' \ -e 's,@@VERSION@@,$(MAJOR).$(MINOR).$(TINY),' glw.pc: glw.pc.in $(pcedit) $< > $@@ install: glw.pc $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig $(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_DIR)/include/GL $(INSTALL) $(TOP)/$(LIB_DIR)/libGLw.* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig clean: -rm depend depend.bak -rm -f *.o *~ # Make the library $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS) $(TOP)/bin/mklib -o $(GLW_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -major $(MAJOR) -minor $(MINOR) -patch $(TINY) \ $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ $(GLW_LIB_DEPS) $(OBJECTS) # # Run 'make depend' to update the dependencies if you change what's included # by any source file. # depend: $(GLW_SOURCES) touch depend $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(GLW_SOURCES) \ > /dev/null include depend @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @initial import of MesaLib-7.0.3 @ text @@ 1.1.1.1.2.1 log @Apply patch (requested by mrg in ticket #958): Bring over X.Org updates from HEAD. @ text @d10 1 a10 1 INCDIRS = -I$(TOP)/include $(MOTIF_CFLAGS) $(X11_INCLUDES) d31 2 a32 6 -e 's,@@INSTALL_LIB_DIR@@,$(INSTALL_LIB_DIR),' \ -e 's,@@INSTALL_INC_DIR@@,$(INSTALL_INC_DIR),' \ -e 's,@@VERSION@@,$(MAJOR).$(MINOR).$(TINY),' \ -e 's,@@GLW_PC_REQ_PRIV@@,$(GLW_PC_REQ_PRIV),' \ -e 's,@@GLW_PC_LIB_PRIV@@,$(GLW_PC_LIB_PRIV),' \ -e 's,@@GLW_PC_CFLAGS@@,$(GLW_PC_CFLAGS),' d37 6 a42 6 $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig $(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_INC_DIR)/GL $(INSTALL) $(TOP)/$(LIB_DIR)/$(GLW_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR) $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig d45 2 a46 2 -rm -f depend depend.bak -rm -f *.o *.pc *~ d51 1 a51 1 $(MKLIB) -o $(GLW_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ a53 1 -id $(INSTALL_LIB_DIR)/lib$(GLW_LIB).$(MAJOR).dylib \ d64 1 a64 1 $(X11_INCLUDES) > /dev/null @ 1.1.1.2 log @initial import of MesaLib-7.4.2 @ text @d10 1 a10 1 INCDIRS = -I$(TOP)/include $(MOTIF_CFLAGS) $(X11_INCLUDES) d31 2 a32 6 -e 's,@@INSTALL_LIB_DIR@@,$(INSTALL_LIB_DIR),' \ -e 's,@@INSTALL_INC_DIR@@,$(INSTALL_INC_DIR),' \ -e 's,@@VERSION@@,$(MAJOR).$(MINOR).$(TINY),' \ -e 's,@@GLW_PC_REQ_PRIV@@,$(GLW_PC_REQ_PRIV),' \ -e 's,@@GLW_PC_LIB_PRIV@@,$(GLW_PC_LIB_PRIV),' \ -e 's,@@GLW_PC_CFLAGS@@,$(GLW_PC_CFLAGS),' d37 6 a42 6 $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig $(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_INC_DIR)/GL $(INSTALL) $(TOP)/$(LIB_DIR)/$(GLW_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR) $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig d45 2 a46 2 -rm -f depend depend.bak -rm -f *.o *.pc *~ d51 1 a51 1 $(MKLIB) -o $(GLW_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ a53 1 -id $(INSTALL_LIB_DIR)/lib$(GLW_LIB).$(MAJOR).dylib \ d64 1 a64 1 $(X11_INCLUDES) > /dev/null @ 1.1.1.3 log @initial import of MesaLib-7.7.1 @ text @d36 1 a36 2 -e 's,@@GLW_PC_CFLAGS@@,$(GLW_PC_CFLAGS),' \ -e 's,@@GLW_LIB@@,$(GLW_LIB),' d45 1 a45 1 $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GLW_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR) a66 1 rm -f depend @ 1.1.1.4 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 @d20 1 a20 1 $(CC) -c $(INCDIRS) $(CFLAGS) $(GLW_CFLAGS) $< d74 1 a74 1 -include depend @ 1.1.1.4.2.1 log @File removals that accidently did not happen during pullup of the new MesaLib for ticket #381 @ text @@