Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 300328 | Differences between
and this patch

Collapse All | Expand All

(-)a/Makefile (-8 / +8 lines)
Lines 29-40 NFORENUM = $(shell [ \( $(ISCYGWIN) -eq 1 \) -o \( $(ISMINGW) -eq 1 \) ] && echo Link Here
29
29
30
# use 386 instructions but optimize for pentium II/III
30
# use 386 instructions but optimize for pentium II/III
31
ifeq ($(ISCYGWIN),1)
31
ifeq ($(ISCYGWIN),1)
32
CFLAGS = -g -mno-cygwin -O1 -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized $(CFLAGAPP)
32
CFLAGS +=  -mno-cygwin  -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized
33
CXXFLAGS +=  -mno-cygwin  -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized
33
else
34
else
34
CFLAGS = -g -O1 -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized $(CFLAGAPP)
35
CFLAGS +=   -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized
36
CXXFLAGS +=   -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized
35
endif
37
endif
36
38
37
CXXFLAGS = $(CFLAGS)
38
39
39
-include ${MAKEFILELOCAL}
40
-include ${MAKEFILELOCAL}
40
41
Lines 120-126 BOOST_WARN = echo Warning: NO_BOOST is no longer obeyed. Link Here
120
endif
121
endif
121
122
122
# targets
123
# targets
123
all: $(NFORENUM)
124
all: version.h $(NFORENUM)
124
remake: clean all
125
remake: clean all
125
126
126
${MAKEFILELOCAL}:
127
${MAKEFILELOCAL}:
Lines 130-136 ${MAKEFILELOCAL}: Link Here
130
131
131
$(NFORENUM): $(NFORENUMSRC:%.cpp=%.o)
132
$(NFORENUM): $(NFORENUMSRC:%.cpp=%.o)
132
	$(_E) [LD] $@
133
	$(_E) [LD] $@
133
	$(_C)$(CXX) -o $@ $(CFLAGS) $^ $(LDOPT)
134
	$(_C)$(CXX) -o $@ $(CXXFLAGS) $^ $(LDOPT)
134
135
135
136
136
clean:
137
clean:
Lines 141-149 release: FORCE Link Here
141
	$(_E)[REBUILD] $(NFORENUM)
142
	$(_E)[REBUILD] $(NFORENUM)
142
	$(_C)rm -f $(NFORENUM)
143
	$(_C)rm -f $(NFORENUM)
143
	$(_C)$(MAKE) $(_S)
144
	$(_C)$(MAKE) $(_S)
144
	$(_E) [STRIP/UPX] $(NFORENUM)
145
	$(_C)$(STRIP) $(NFORENUM)
145
	$(_C)$(STRIP) $(NFORENUM)
146
	$(_C)upx $(_Q) --best $(NFORENUM)
147
146
148
FORCE:
147
FORCE:
149
	@$(BOOST_WARN)
148
	@$(BOOST_WARN)
Lines 175-181 version.h: FORCE Link Here
175
174
176
%.o.d:
175
%.o.d:
177
	$(_E) [CPP DEP] $@
176
	$(_E) [CPP DEP] $@
178
	$(_C)$(CC) $(CFLAGS) -DMAKEDEP -MM -MG $*.c* -MF $@
177
	$(_C)$(CC) $(CFLAGS) -DMAKEDEP -MM -MG getopt.c -MF $@
178
	$(_C)$(CXX) $(CXXFLAGS) -DMAKEDEP -MM -MG $*.cpp -MF $@
179
179
180
ifndef NO_MAKEFILE_DEP
180
ifndef NO_MAKEFILE_DEP
181
-include $(NFORENUMSRC:.cpp=.o.d)
181
-include $(NFORENUMSRC:.cpp=.o.d)

Return to bug 300328