]>
Commit | Line | Data |
---|---|---|
18558180 ER |
1 | --- anaconda-11.0.5/Makefile 2006-05-24 18:14:57.185905429 +0300 |
2 | +++ anaconda-11.0.5/Makefile 2006-05-24 18:46:24.328179443 +0300 | |
3 | @@ -14,6 +14,8 @@ | |
4 | endif | |
5 | endif | |
6 | ||
7 | +OPTFLAGS = -ggdb | |
8 | +CFLAGS = $(OPTFLAGS) | |
9 | CATALOGS = po/anaconda.pot | |
10 | ||
11 | PYFILES = $(wildcard *.py) | |
12 | @@ -24,15 +26,15 @@ | |
f2a2f4d7 ER |
13 | PYTHONPATH="." python scripts/getlangnames.py > lang-names |
14 | ||
15 | mini-wm: mini-wm.c | |
16 | - gcc -o mini-wm mini-wm.c `pkg-config gtk+-x11-2.0 --cflags --libs`$(CFLAGS) | |
17 | + $(CC) -o mini-wm mini-wm.c `pkg-config gtk+-x11-2.0 --cflags --libs`$(CFLAGS) | |
18 | ||
19 | xmouse.so: xmouse.c | |
20 | - gcc -Wall -o xmouse.o -fPIC -I/usr/X11R6/include -I$(PYTHONINCLUDE) -I $(PYTHONINCLUDE) -c xmouse.c $(CFLAGS) | |
21 | - gcc -o xmouse.so -shared xmouse.o -L/usr/X11R6/$(LIBDIR) -lXxf86misc -lX11 -lXext | |
22 | + $(CC) -Wall -o xmouse.o -fPIC -I/usr/X11R6/include -I$(PYTHONINCLUDE) -I $(PYTHONINCLUDE) -c xmouse.c $(CFLAGS) | |
23 | + $(CC) -o xmouse.so -shared xmouse.o -L/usr/X11R6/$(LIBDIR) -lXxf86misc -lX11 -lXext | |
24 | ||
25 | xutils.so: xutils.c | |
26 | - gcc -ggdb -Wall -o xutils.o -fPIC -I/usr/X11R6/include -I$(PYTHONINCLUDE) -I $(PYTHONINCLUDE) -c xutils.c $(CFLAGS) | |
27 | - gcc -o xutils.so -shared xutils.o -ggdb -L/usr/X11R6/$(LIBDIR) -lX11 | |
18558180 ER |
28 | + $(CC) $(OPTFLAGS) -Wall -o xutils.o -fPIC -I/usr/X11R6/include -I$(PYTHONINCLUDE) -I $(PYTHONINCLUDE) -c xutils.c $(CFLAGS) |
29 | + $(CC) -o xutils.so -shared xutils.o $(OPTFLAGS) -L/usr/X11R6/$(LIBDIR) -lX11 | |
f2a2f4d7 ER |
30 | |
31 | depend: | |
32 | rm -f *.o *.so *.pyc | |
18558180 ER |
33 | --- anaconda-11.0.5/isomd5sum/Makefile~ 2005-03-02 04:29:39.000000000 +0200 |
34 | +++ anaconda-11.0.5/isomd5sum/Makefile 2006-05-24 18:37:29.636215985 +0300 | |
35 | @@ -1,6 +1,7 @@ | |
36 | include ../Makefile.inc | |
37 | ||
38 | -CFLAGS = -g -fPIC -D_FILE_OFFSET_BITS=64 -I$(PYTHONINCLUDE) -O -Wall -Werror \ | |
39 | +OPTFLAGS = -g -O | |
40 | +CFLAGS = $(OPTFLAGS) -fPIC -D_FILE_OFFSET_BITS=64 -I$(PYTHONINCLUDE) -Wall -Werror \ | |
41 | -D_FORTIFY_SOURCE=2 | |
42 | OBJECTS = md5.o libimplantisomd5.o checkisomd5.o pyisomd5sum.c \ | |
43 | implantisomd5 checkisomd5 | |
44 | @@ -18,14 +19,14 @@ | |
45 | all: implantisomd5 checkisomd5 pyisomd5sum.so | |
46 | ||
47 | %.o: %.c | |
48 | - gcc -c -O $(CFLAGS) -o $@ $< | |
49 | + $(CC) -c $(OPTFLAGS) $(CFLAGS) -o $@ $< | |
50 | ||
51 | implantisomd5: implantisomd5.o md5.o libimplantisomd5.o | |
52 | ||
53 | checkisomd5: checkisomd5.o md5.o libcheckisomd5.o | |
54 | ||
55 | pyisomd5sum.so: $(PYOBJS) | |
56 | - gcc -shared -g -o pyisomd5sum.so -fpic $(PYOBJS) | |
57 | + $(CC) -shared $(OPTFLAGS) -o pyisomd5sum.so -fpic $(PYOBJS) | |
58 | ||
59 | install: | |
60 | install -m 755 implantisomd5 $(DESTDIR)/$(RUNTIMEDIR) | |
61 | --- anaconda-11.0.5/stubs/Makefile~ 2006-02-22 22:00:32.000000000 +0200 | |
62 | +++ anaconda-11.0.5/stubs/Makefile 2006-05-24 18:38:42.777854857 +0300 | |
63 | @@ -9,7 +9,7 @@ | |
64 | all: $(TARGETS) libunicode-lite.a | |
65 | ||
66 | $(LIBUTF8): unicode-lite.c | |
67 | - gcc -fPIC -shared -o $@ $< -D_FORTIFY_SOURCE=2 | |
68 | + $(CC) -fPIC -shared -o $@ $< -D_FORTIFY_SOURCE=2 $(OPTFLAGS) | |
69 | ||
70 | libunicode-lite.a: libunicode-lite.a($(OBJECTS)) | |
71 | ||
72 | --- anaconda-11.0.5/loader2/Makefile~ 2006-02-22 22:00:32.000000000 +0200 | |
73 | +++ anaconda-11.0.5/loader2/Makefile 2006-05-24 18:41:33.111671407 +0300 | |
74 | @@ -34,12 +34,13 @@ | |
75 | HWLIBS += -lpci | |
76 | endif | |
77 | ||
78 | -CFLAGS += -DUSE_LOGDEV -DVERSION='"$(VERSION)"' | |
79 | +OPTFLAGS = -ggdb | |
80 | +CFLAGS += -DUSE_LOGDEV -DVERSION='"$(VERSION)"' $(OPTFLAGS) | |
81 | STATIC = -static | |
82 | REALCC=gcc | |
83 | ||
84 | ifeq (1, $(USEDIET)) | |
85 | -CFLAGS += -DGZLIB=1 -DDIET=1 | |
86 | +CFLAGS += -DGZLIB=1 -DDIET=1 $(OPTFLAGS) | |
87 | DIET=diet | |
88 | CC=$(DIET) $(REALCC) | |
89 | ISYSLIB = ../isys/libisys-diet.a | |
90 | @@ -128,7 +129,7 @@ | |
91 | $(CC) -DTESTING $(CFLAGS) -o mediacheck.o -c mediacheck.c | |
92 | $(CC) -DTESTING $(CFLAGS) -o log.o -c log.c | |
93 | $(CC) -DTESTING $(CFLAGS) -o md5.o -c md5.c | |
94 | - $(CC) -g $(STATIC) -o checkisomd5 mediacheck.o log.o md5.o \ | |
95 | + $(CC) $(OPTFLAGS) -g $(STATIC) -o checkisomd5 mediacheck.o log.o md5.o \ | |
96 | $(NEWTLIB) $(SLANGLIB) | |
97 | ||
98 | install: all | |
99 | @@ -142,7 +143,7 @@ | |
100 | install -m 644 module-info $(DESTDIR)/$(RUNTIMEDIR)/loader | |
101 | ||
102 | dirbrowser: dirbrowser.c | |
103 | - gcc -DSTANDALONE -D_FORTIFY_SOURCE=2 -Wall -Werror -ggdb -o dirbrowser dirbrowser.c -lnewt -lslang | |
104 | + $(CC) -DSTANDALONE -D_FORTIFY_SOURCE=2 -Wall -Werror $(OPTFLAGS) -o dirbrowser dirbrowser.c -lnewt -lslang | |
105 | ||
106 | ifeq (.depend,$(wildcard .depend)) | |
107 | include .depend | |
108 | --- anaconda-11.0.5/isys/Makefile~ 2006-02-22 22:04:46.000000000 +0200 | |
109 | +++ anaconda-11.0.5/isys/Makefile 2006-05-24 18:43:02.223663837 +0300 | |
110 | @@ -1,6 +1,7 @@ | |
111 | include ../Makefile.inc | |
112 | ||
113 | -CFLAGS += -I$(PYTHONINCLUDE) -I.. -DHAVE_NFS | |
114 | +OPTFLAGS = -g | |
115 | +CFLAGS += -I$(PYTHONINCLUDE) -I.. -DHAVE_NFS $(OPTFLAGS) | |
116 | ||
117 | OBJECTS = nfsmount.o nfsmount_clnt.o nfsmount_xdr.o imount.o getmacaddr.o \ | |
118 | smp.o devnodes.o cpio.o uncpio.o dasd.o \ | |
119 | @@ -48,10 +49,10 @@ | |
120 | $(DIET) $(CC) -c $(CFLAGS) -DGZLIB=1 -DDIET=1 "-Du_char=unsigned char" -o $@ $< | |
121 | ||
122 | _isys.so: isys.lo $(SOBJECTS) | |
123 | - gcc -shared -g -fPIC -o $@ isys.lo $(SOBJECTS) $(LOADLIBES) | |
124 | + $(CC) -shared $(OPTFLAGS) -fPIC -o $@ isys.lo $(SOBJECTS) $(LOADLIBES) | |
125 | ||
126 | _silo.so: silo.c | |
127 | - gcc -shared $(CFLAGS) -fpic -o $@ silo.c ../balkan/libbalkan.a | |
128 | + $(CC) -shared $(CFLAGS) -fpic -o $@ silo.c ../balkan/libbalkan.a | |
129 | ||
130 | libisys.a: libisys.a($(OBJECTS)) | |
131 | ||
132 | --- anaconda-11.0.5/isys/gzlib/Makefile~ 2005-06-13 22:09:23.000000000 +0300 | |
133 | +++ anaconda-11.0.5/isys/gzlib/Makefile 2006-05-24 18:43:33.684366732 +0300 | |
134 | @@ -1,6 +1,6 @@ | |
135 | include ../../Makefile.inc | |
136 | ||
137 | -CFLAGS += -I . -fPIC | |
138 | +CFLAGS += -I . -fPIC $(OPTFLAGS) | |
139 | SOURCES = bits.c gzip.c inflate.c lzw.c trees.c unzip.c util.c zip.c binding.c \ | |
140 | deflate.c zip.c | |
141 | OBJS = $(patsubst %.c,%.o,$(SOURCES)) | |
142 | --- anaconda-11.0.5/utils/Makefile~ 2006-01-30 21:40:06.000000000 +0200 | |
143 | +++ anaconda-11.0.5/utils/Makefile 2006-05-24 18:44:44.615951525 +0300 | |
144 | @@ -7,7 +7,8 @@ | |
145 | ||
146 | LOADERDIR = ../loader2 | |
147 | LOADLIBES = -lpopt | |
148 | -CFLAGS += -I.. -I$(LOADERDIR) -fno-strict-aliasing | |
149 | +OPTFLAGS = -O -g | |
150 | +CFLAGS += -I.. -I$(LOADERDIR) -fno-strict-aliasing $(OPTFLAGS) | |
151 | RPMCFLAGS = $(CFLAGS) -I/usr/include/rpm | |
152 | LDFLAGS = -g | |
153 | ||
154 | @@ -37,7 +38,7 @@ | |
155 | $(LOADLIBES) -lresolv -lpopt -lbz2 | |
156 | ||
157 | md5.o: md5.c md5.h | |
158 | - gcc -c -O -g md5.c -D_FORTIFY_SOURCE=2 | |
159 | + $(CC) -c $(OPTFLAGS) md5.c -D_FORTIFY_SOURCE=2 | |
160 | ||
161 | hash.o : hash.c | |
162 | $(CC) $(RPMCFLAGS) -c -o $@ $< |