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

Collapse All | Expand All

(-)build/gcc/Makefile.jj (-18 / +16 lines)
Lines 28-49 Link Here
28
bindir = bin
28
bindir = bin
29
objdir = obj
29
objdir = obj
30
ipath=$(prefix)/bin
30
ipath=$(prefix)/bin
31
CBASEFLAGS = -W -Wall -fno-rtti -fno-exceptions
32
JAVAINCS   = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
31
JAVAINCS   = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
33
CXX = g++
34
INSTALL=install -o $(USER) -g $(USER)
32
INSTALL=install -o $(USER) -g $(USER)
35
33
36
##################################################
34
##################################################
37
35
38
# define compile options for each build
36
# define compile options for each build
39
CFLAGS   = -DNDEBUG -O3 $(CBASEFLAGS)
37
CFLAGSnd = -DNDEBUG $(CFLAGS)
40
CFLAGSd  = -g $(CBASEFLAGS)
38
CFLAGSd  = -g $(CFLAGS)
41
CFLAGSs  = -DNDEBUG -DASTYLE_LIB -O3 -fpic $(CBASEFLAGS)
39
CFLAGSs  = -DNDEBUG -DASTYLE_LIB -fpic $(CFLAGSnd)
42
CFLAGSsd = -DASTYLE_LIB -g -fpic $(CBASEFLAGS)
40
CFLAGSsd = -DASTYLE_LIB -g -fpic $(CFLAGSd)
43
CFLAGSa  = -DNDEBUG -DASTYLE_LIB -O3 $(CBASEFLAGS)
41
CFLAGSa  = -DNDEBUG -DASTYLE_LIB $(CFLAGSnd)
44
CFLAGSad = -DASTYLE_LIB -g $(CBASEFLAGS)
42
CFLAGSad = -DASTYLE_LIB -g $(CFLAGSd)
45
CFLAGSsj  = -DNDEBUG -DASTYLE_JNI -O3 -fpic $(CBASEFLAGS) $(JAVAINCS)
43
CFLAGSsj  = -DNDEBUG -DASTYLE_JNI -fpic $(CFLAGSnd) $(JAVAINCS)
46
CFLAGSsjd = -DASTYLE_JNI -g -fpic $(CBASEFLAGS) $(JAVAINCS)
44
CFLAGSsjd = -DASTYLE_JNI -g -fpic $(CFLAGSd) $(JAVAINCS)
47
45
48
# object files are built from the source list $(SRC)
46
# object files are built from the source list $(SRC)
49
# a suffix is added for each build
47
# a suffix is added for each build
Lines 61-67 Link Here
61
# OBJ
59
# OBJ
62
$(objdir)/%.o:  %.cpp  astyle.h  astyle_main.h
60
$(objdir)/%.o:  %.cpp  astyle.h  astyle_main.h
63
	@ mkdir -p $(objdir)
61
	@ mkdir -p $(objdir)
64
	$(CXX) $(CFLAGS) -c -o $@ $<
62
	$(CXX) $(CFLAGSnd) -c -o $@ $<
65
63
66
# OBJd
64
# OBJd
67
$(objdir)/%_d.o:  %.cpp  astyle.h  astyle_main.h
65
$(objdir)/%_d.o:  %.cpp  astyle.h  astyle_main.h
Lines 104-128 Link Here
104
release:  astyle
102
release:  astyle
105
astyle:  $(OBJ)
103
astyle:  $(OBJ)
106
	@ mkdir -p $(bindir)
104
	@ mkdir -p $(bindir)
107
	$(CXX) -s -o $(bindir)/$@ $^
105
	$(CXX) $(LDFLAGS) -o $(bindir)/$@ $^
108
	@ echo
106
	@ echo
109
107
110
debug:  astyled
108
debug:  astyled
111
astyled:  $(OBJd)
109
astyled:  $(OBJd)
112
	@ mkdir -p $(bindir)
110
	@ mkdir -p $(bindir)
113
	$(CXX) -o $(bindir)/$@ $^
111
	$(CXX) $(LDFLAGS) -o $(bindir)/$@ $^
114
	@ echo
112
	@ echo
115
113
116
shared:  libastyle.so
114
shared:  libastyle.so
117
libastyle.so:  $(OBJs)
115
libastyle.so:  $(OBJs)
118
	@ mkdir -p $(bindir)
116
	@ mkdir -p $(bindir)
119
	$(CXX) -shared -s -o $(bindir)/$@ $^
117
	$(CXX) -shared $(LDFLAGS) -o $(bindir)/$@ $^
120
	@ echo
118
	@ echo
121
119
122
shareddebug:  libastyled.so
120
shareddebug:  libastyled.so
123
libastyled.so:  $(OBJsd)
121
libastyled.so:  $(OBJsd)
124
	@ mkdir -p $(bindir)
122
	@ mkdir -p $(bindir)
125
	$(CXX) -shared -o $(bindir)/$@ $^
123
	$(CXX) -shared $(LDFLAGS) -o $(bindir)/$@ $^
126
	@ echo
124
	@ echo
127
125
128
static:  libastyle.a
126
static:  libastyle.a
Lines 140-152 Link Here
140
java:  libastylej.so
138
java:  libastylej.so
141
libastylej.so:  $(OBJsj)
139
libastylej.so:  $(OBJsj)
142
	@ mkdir -p $(bindir)
140
	@ mkdir -p $(bindir)
143
	$(CXX) -shared -s -o $(bindir)/$@ $^
141
	$(CXX) -shared $(LDFLAGS) -o $(bindir)/$@ $^
144
	@ echo
142
	@ echo
145
143
146
javadebug:  libastylejd.so
144
javadebug:  libastylejd.so
147
libastylejd.so:  $(OBJsjd)
145
libastylejd.so:  $(OBJsjd)
148
	@ mkdir -p $(bindir)
146
	@ mkdir -p $(bindir)
149
	$(CXX) -shared -o $(bindir)/$@ $^
147
	$(CXX) -shared $(LDFLAGS) -o $(bindir)/$@ $^
150
	@ echo
148
	@ echo
151
149
152
all:  release debug shared shareddebug static staticdebug
150
all:  release debug shared shareddebug static staticdebug
Lines 158-164 Link Here
158
156
159
cleanobj:
157
cleanobj:
160
	rm -f $(objdir)/*.o
158
	rm -f $(objdir)/*.o
161
	
159
162
install:
160
install:
163
	$(INSTALL) -m 755 -d $(ipath)
161
	$(INSTALL) -m 755 -d $(ipath)
164
	@$(INSTALL) -m 755 $(bindir)/astyle  $(ipath)
162
	@$(INSTALL) -m 755 $(bindir)/astyle  $(ipath)

Return to bug 311281