diff options
author | Mike Buland <eichlan@xagasoft.com> | 2014-01-30 15:43:29 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2014-01-30 15:43:29 +0000 |
commit | 29153409ed1ca86261f5d1084a0503e3291f3628 (patch) | |
tree | b821d55a8dc89eb0099cf891de23c79e7e68421e | |
parent | 9072b0c98ba4f9412885a1a32002ee7214fd3dc0 (diff) | |
download | libbu++-29153409ed1ca86261f5d1084a0503e3291f3628.tar.gz libbu++-29153409ed1ca86261f5d1084a0503e3291f3628.tar.bz2 libbu++-29153409ed1ca86261f5d1084a0503e3291f3628.tar.xz libbu++-29153409ed1ca86261f5d1084a0503e3291f3628.zip |
Updated Makefile, I used g++ instead of ${CXX} in several places.
Diffstat (limited to '')
-rw-r--r-- | Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -64,42 +64,42 @@ tools: ${TOOLS} | |||
64 | ${TOOLS}: %: src/tools/%.cpp libbu++.a | 64 | ${TOOLS}: %: src/tools/%.cpp libbu++.a |
65 | 65 | ||
66 | $(filter-out viewcsv bin2cpp,${TOOLS}): | 66 | $(filter-out viewcsv bin2cpp,${TOOLS}): |
67 | g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ | 67 | ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ |
68 | 68 | ||
69 | viewcsv: | 69 | viewcsv: |
70 | g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lncurses | 70 | ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lncurses |
71 | 71 | ||
72 | bin2cpp: | 72 | bin2cpp: |
73 | g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lbz2 -lz -llzma | 73 | ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lbz2 -lz -llzma |
74 | 74 | ||
75 | myriad: | 75 | myriad: |
76 | g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lpthread | 76 | ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lpthread |
77 | 77 | ||
78 | ${OBJECTS}: %.o: %.cpp | 78 | ${OBJECTS}: %.o: %.cpp |
79 | g++ -ggdb -W -Wall -I. ${CXXFLAGS} $< -c -o $@ | 79 | ${CXX} -ggdb -W -Wall -I. ${CXXFLAGS} $< -c -o $@ |
80 | 80 | ||
81 | $(patsubst %,src/%.cpp,${UNITS}): %.cpp: %.unit mkunit | 81 | $(patsubst %,src/%.cpp,${UNITS}): %.cpp: %.unit mkunit |
82 | ./mkunit $< $@ | 82 | ./mkunit $< $@ |
83 | 83 | ||
84 | ${UNITS}: %: src/%.cpp | 84 | ${UNITS}: %: src/%.cpp |
85 | g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ | 85 | ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ |
86 | 86 | ||
87 | ${TESTS}: %: src/%.cpp | 87 | ${TESTS}: %: src/%.cpp |
88 | 88 | ||
89 | $(filter-out tests/bzip2 tests/deflate tests/lzma,${TESTS}): | 89 | $(filter-out tests/bzip2 tests/deflate tests/lzma,${TESTS}): |
90 | g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ | 90 | ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ |
91 | 91 | ||
92 | tests/bzip2: | 92 | tests/bzip2: |
93 | g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lbz2 | 93 | ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lbz2 |
94 | 94 | ||
95 | tests/deflate: | 95 | tests/deflate: |
96 | g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lz | 96 | ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lz |
97 | 97 | ||
98 | tests/lzma: | 98 | tests/lzma: |
99 | g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -llzma | 99 | ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -llzma |
100 | 100 | ||
101 | tests/threadid: | 101 | tests/threadid: |
102 | g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lpthread | 102 | ${CXX} -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lpthread |
103 | 103 | ||
104 | libbu++.a: bu ${HEADERS} ${OBJECTS} | 104 | libbu++.a: bu ${HEADERS} ${OBJECTS} |
105 | ar -r libbu++.a ${OBJECTS} | 105 | ar -r libbu++.a ${OBJECTS} |