diff --git a/Makefile b/Makefile
index 3e394f058f9f266778df401a8587d539ddf54e10..b1fac089f138b1ae207a0a16fec379fe5e6e6f2c 100644 (file)
--- a/Makefile
+++ b/Makefile
# * $(MODULE)/*.cc -- module source files
MODULES := main reader store alien typeregister textmodel fold typepath
-CFLAGS += -I.
+CXXFLAGS = -I.
+CXX = g++
# Variables for the modules to write to
SRCS :=
# This rule just links the object files together
odcread: $(SRCS:.cc=.o)
- g++ -o $@ $^
+ $(CXX) -liconv -o $@ $^
# This rule build an object (.o) from a source (.cc).
%.o: %.cc
- g++ $(CFLAGS) $< -c -o $@
+ $(CXX) $(CXXFLAGS) $< -c -o $@
# For each implementation header (.ih) generate a dependency (.d) file which
# will ensure that the compiled header (.ih.gch) is rebuilt whenever the header
# The .d file is not an explicit target because it will need to be (re-)built
# if and only if the .ih.gch needs to be rebuilt.
%.ih.gch: %.ih
- g++ $(CFLAGS) -x c++-header $< -MM -MF $*.d -MP -MT $@
- g++ $(CFLAGS) -x c++-header $< -o $@
+ $(CXX) $(CXXFLAGS) -x c++-header $< -MM -MF $*.d -MP -MT $@
+ $(CXX) $(CXXFLAGS) -x c++-header $< -o $@
# Each module has a .ih file that should be *the only* include from the .cc
# files. These .ih files are pre-compiled to .ih.gch, and dependency caching