summaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:37:28 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:37:28 +0000
commit28aeb43eee402f13bec56cd16c1e075a26211260 (patch)
tree64bf759e5198aa7286899e4c0c6fda02c69ae972 /Makefile.in
parentAdding debian version 1.2-2. (diff)
downloadzutils-28aeb43eee402f13bec56cd16c1e075a26211260.tar.xz
zutils-28aeb43eee402f13bec56cd16c1e075a26211260.zip
Merging upstream version 1.3~pre1.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in20
1 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in
index 478c039..f445454 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,13 +26,13 @@ scripts = zegrep zfgrep
all : $(programs) $(scripts)
zcat : $(zcat_objs)
- $(CXX) $(LDFLAGS) -o $@ $(zcat_objs)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(zcat_objs)
zcmp : $(zcmp_objs)
- $(CXX) $(LDFLAGS) -o $@ $(zcmp_objs)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(zcmp_objs)
zdiff : $(zdiff_objs)
- $(CXX) $(LDFLAGS) -o $@ $(zdiff_objs)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(zdiff_objs)
zegrep : zegrep.in
cat $(VPATH)/zegrep.in > $@
@@ -43,25 +43,25 @@ zfgrep : zfgrep.in
chmod a+x zfgrep
zgrep : $(zgrep_objs)
- $(CXX) $(LDFLAGS) -o $@ $(zgrep_objs)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(zgrep_objs)
ztest : $(ztest_objs)
- $(CXX) $(LDFLAGS) -o $@ $(ztest_objs)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(ztest_objs)
zupdate : $(zupdate_objs)
- $(CXX) $(LDFLAGS) -o $@ $(zupdate_objs)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(zupdate_objs)
rc.o : rc.cc
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -DSYSCONFDIR=\"$(sysconfdir)\" -c -o $@ $<
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -DPROGVERSION=\"$(pkgversion)\" -DSYSCONFDIR=\"$(sysconfdir)\" -c -o $@ $<
zdiff.o : zdiff.cc
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DDIFF=\"$(DIFF)\" -c -o $@ $<
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -DDIFF=\"$(DIFF)\" -c -o $@ $<
zgrep.o : zgrep.cc
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DGREP=\"$(GREP)\" -c -o $@ $<
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -DGREP=\"$(GREP)\" -c -o $@ $<
%.o : %.cc
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
$(objs) : Makefile
$(scripts) : Makefile