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

Collapse All | Expand All

(-)makefile.old (-7 / +11 lines)
Lines 93-127 Link Here
93
93
94
$(BINDIR_XMLIN)/InputSymbolTranslation.o: InputSymbolTranslation.cpp InputSymbolTranslation.inc
94
$(BINDIR_XMLIN)/InputSymbolTranslation.o: InputSymbolTranslation.cpp InputSymbolTranslation.inc
95
95
96
CFLAGS = -O2
96
CFLAGS ?= -O2
97
97
98
VPATH = Source:Source/BlahtexCore:Source/BlahtexXMLin
98
VPATH = Source:Source/BlahtexCore:Source/BlahtexXMLin
99
99
100
INCLUDES=-I. -ISource -ISource/BlahtexCore -ISource/BlahtexXMLin
100
INCLUDES=-I. -ISource -ISource/BlahtexCore -ISource/BlahtexXMLin
101
101
102
CXXFLAGS += $(shell pkg-config --cflags xerces-c)
103
104
XERCES_LIB = $(shell pkg-config --libs xerces-c)
105
102
$(BINDIR)/%.o:%.cpp
106
$(BINDIR)/%.o:%.cpp
103
	$(CXX) $(INCLUDES) $(CFLAGS) -c $< -o $@
107
	$(CXX) $(INCLUDES) $(CXXFLAGS) -c $< -o $@
104
108
105
$(BINDIR)/%.o:%.c
109
$(BINDIR)/%.o:%.c
106
	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
110
	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
107
111
108
$(BINDIR_XMLIN)/%.o:%.cpp
112
$(BINDIR_XMLIN)/%.o:%.cpp
109
	$(CXX) $(INCLUDES) $(CFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@
113
	$(CXX) $(INCLUDES) $(CXXFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@
110
114
111
$(BINDIR_XMLIN)/%.o:%.c
115
$(BINDIR_XMLIN)/%.o:%.c
112
	$(CC) $(INCLUDES) $(CFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@
116
	$(CC) $(INCLUDES) $(CFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@
113
117
114
blahtex-linux:  $(BINDIR) $(OBJECTS)  $(HEADERS)
118
blahtex-linux:  $(BINDIR) $(OBJECTS)  $(HEADERS)
115
	$(CXX) $(CFLAGS) -o blahtex $(OBJECTS)
119
	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o blahtex $(OBJECTS) $(LIBS)
116
120
117
blahtex-mac: $(BINDIR) $(OBJECTS)  $(HEADERS)
121
blahtex-mac: $(BINDIR) $(OBJECTS)  $(HEADERS)
118
	$(CXX) $(CFLAGS) -o blahtex -liconv $(OBJECTS)
122
	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o blahtex -liconv $(OBJECTS) $(LIBS)
119
123
120
blahtexml-linux:  $(BINDIR_XMLIN) $(OBJECTS_XMLIN)  $(HEADERS_XMLIN)
124
blahtexml-linux:  $(BINDIR_XMLIN) $(OBJECTS_XMLIN)  $(HEADERS_XMLIN)
121
	$(CXX) $(CFLAGS) -o blahtexml $(OBJECTS_XMLIN) -lxerces-c
125
	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o blahtexml $(OBJECTS_XMLIN) $(LIBS) $(XERCES_LIB)
122
126
123
blahtexml-mac: $(BINDIR_XMLIN) $(OBJECTS_XMLIN)  $(HEADERS_XMLIN)
127
blahtexml-mac: $(BINDIR_XMLIN) $(OBJECTS_XMLIN)  $(HEADERS_XMLIN)
124
	$(CXX) $(CFLAGS) -o blahtexml -liconv $(OBJECTS_XMLIN) -lxerces-c
128
	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o blahtexml -liconv $(OBJECTS_XMLIN) $(LIBS) $(XERCES_LIB)
125
129
126
clean:
130
clean:
127
	rm -f blahtex $(OBJECTS) blahtexml $(OBJECTS_XMLIN)
131
	rm -f blahtex $(OBJECTS) blahtexml $(OBJECTS_XMLIN)

Return to bug 431566