Merged.

4 years ago · 455e0b2427
parent 08ac806145 5217af7cf6
commit 455e0b2427
2 changed files with 3 additions and 3 deletions
--- a/c/Makefile
+++ b/c/Makefile
@ -65,11 +65,11 @@ clean:

 # Executable files
 %: %.o $(LIBFILE)
-	$(CC) $(CFLAGS) -o $@ $< -L . -l $(LIB)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB)

 # Special executable
 qrcodegen-test: qrcodegen-test.c $(LIBOBJ:%.o=%.c)
-	$(CC) $(CFLAGS) -DQRCODEGEN_TEST -o $@ $^
+	$(CC) $(CFLAGS) $(LDFLAGS) -DQRCODEGEN_TEST -o $@ $^

 # The library
 $(LIBFILE): $(LIBOBJ)
--- a/cpp/Makefile
+++ b/cpp/Makefile
@ -65,7 +65,7 @@ clean:

 # Executable files
 %: %.o $(LIBFILE)
-	$(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB)

 # The library
 $(LIBFILE): $(LIBOBJ)