Author: lisu Date: Sat Dec 1 16:22:37 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up for 0.9
- patching Makefile for lib3d
---- Files affected:
SOURCES:
vulcan-Makefile.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/vulcan-Makefile.patch
diff -u SOURCES/vulcan-Makefile.patch:1.1 SOURCES/vulcan-Makefile.patch:1.2
--- SOURCES/vulcan-Makefile.patch:1.1 Sun Nov 11 17:13:06 2007
+++ SOURCES/vulcan-Makefile.patch Sat Dec 1 17:22:32 2007
@@ -1,40 +1,41 @@
---- vulcan-0.7.1/Makefile~ 2007-11-11 18:11:06.000000000 +0100
-+++ vulcan-0.7.1/Makefile 2007-11-11 18:11:03.000000000 +0100
-@@ -1,4 +1,4 @@
+--- vulcan-0.9/Makefile~ 2007-12-01 18:08:20.000000000 +0100
++++ vulcan-0.9/Makefile 2007-12-01 18:08:19.000000000 +0100
+@@ -1,6 +1,6 @@
+ VERSION = 0.9
+
-PREFIX = /usr/local
+PREFIX = /usr
BIN = $(PREFIX)/bin
-
DATA_DIR = $(PREFIX)/share/vulcan
-@@ -12,7 +12,7 @@
+
+@@ -13,7 +13,7 @@
LD = gcc
YACC = bison -y
LEX = flex
--CFLAGS = -O2 -g -Wall -I/usr/X11R6/include -I/usr/local/include
-DDATA_DIR=\"$(DATA_DIR)\" -DFONT_DIR=\"$(FONT_DIR)\"
-DMODEL_DIR=\"$(MODEL_DIR)\" -DTEXTURE_DIR=\"$(TEXTURE_DIR)\"
-+CFLAGS = -Wall -DDATA_DIR=\"$(DATA_DIR)\" -DFONT_DIR=\"$(FONT_DIR)\"
-DMODEL_DIR=\"$(MODEL_DIR)\" -DTEXTURE_DIR=\"$(TEXTURE_DIR)\"
- YFLAGS = -d
- LFLAGS =
- YFILES = vrml.y modeldef.y fontdef.y
-@@ -64,7 +64,7 @@
- $(LEX) $(LFLAGS) -o$@ $<
+-CFLAGS = -O2 -g -Wall \
++CFLAGS = -Wall \
+ -I/usr/X11R6/include -I/usr/local/include -Ilib3d \
+ -DDATA_DIR=\"$(DATA_DIR)\" -DFONT_DIR=\"$(FONT_DIR)\" \
+ -DMODEL_DIR=\"$(MODEL_DIR)\" -DTEXTURE_DIR=\"$(TEXTURE_DIR)\"
+@@ -93,6 +93,7 @@
.c.o:
-- $(CC) $(CFLAGS) -c $<
+ $(CC) $(CFLAGS) -c $<
+ $(CC) $(OPTFLAGS) $(CFLAGS) -c $<
- clean:
- rm -f *.o *~ core* *.stackdump $(YFILES:.y=_y_tab.[ch])
$(LFILES:.l=_lex_yy_i.h) $(TARGET) $(TARBALL) MANIFEST
-@@ -78,17 +78,15 @@
+ lib3d.o:
+ $(MAKE) -C lib3d
+@@ -118,17 +119,15 @@
(cd ..; rm vulcan-$(VERSION))
- install: $(TARGET)
+ install: $(TARGET) chessmodels
- install -s -m 755 $(TARGET) $(BIN)
- install -m 755 -d $(DATA_DIR)
- install -m 755 -d $(FONT_DIR)
- cp data/fonts/* $(FONT_DIR)
- chmod 644 $(FONT_DIR)/*
- install -m 755 -d $(MODEL_DIR)
-- cp data/models/* $(MODEL_DIR)
+- ./chessmodels > $(MODEL_DIR)/chess-models.modeldef
- chmod 644 $(MODEL_DIR)/*
- install -m 755 -d $(TEXTURE_DIR)
- cp data/textures/* $(TEXTURE_DIR)
@@ -45,9 +46,29 @@
+ install -d $(DESTDIR)$(FONT_DIR)
+ cp data/fonts/* $(DESTDIR)$(FONT_DIR)
+ install -d $(DESTDIR)$(MODEL_DIR)
-+ cp data/models/* $(DESTDIR)$(MODEL_DIR)
++ ./chessmodels > $(DESTDIR)$(MODEL_DIR)/chess-models.modeldef
+ install -d $(DESTDIR)$(TEXTURE_DIR)
+ cp data/textures/* $(DESTDIR)$(TEXTURE_DIR)
distclean:
rm -f $(BIN)/$(TARGET)
+--- vulcan-0.9/lib3d/Makefile~ 2007-12-01 18:12:53.000000000 +0100
++++ vulcan-0.9/lib3d/Makefile 2007-12-01 18:12:38.000000000 +0100
+@@ -1,7 +1,7 @@
+ CC = gcc
+ MV = mv
+ LD = gcc
+-CFLAGS = -O2 -g -Wall
++CFLAGS = -Wall
+ YFLAGS = -d
+ LFLAGS =
+ YFILES = vrml.y modeldef.y fontdef.y
+@@ -29,7 +29,7 @@
+ ar cr $@ $(OBJS)
+
+ .c.o:
+- $(CC) $(CFLAGS) -c $<
++ $(CC) $(OPTFLAGS) $(CFLAGS) -c $<
+
+ clean:
+ rm -f $(OBJS) $(TARGET)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/vulcan-Makefile.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
