From cd53419b06767562fb66d0b9e8a77cb4a6459a36 Mon Sep 17 00:00:00 2001 From: "David Z. Chen" Date: Sun, 27 Mar 2016 15:21:40 -0700 Subject: [PATCH] Fix Makefile, correcting filenames and removing missing files. Fixes #145 --- Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index eb9b399d7..e4a8e04b8 100644 --- a/Makefile +++ b/Makefile @@ -54,9 +54,9 @@ LIB_SRC = \ LIB_OBJ = $(LIB_SRC:.cpp=.o) LIB_CPP_SRC = \ - cpp/libjsonnet++.cc + cpp/libjsonnet++.cpp -LIB_CPP_OBJ = $(LIB_OBJ) $(LIB_CPP_SRC:.cc=.o) +LIB_CPP_OBJ = $(LIB_OBJ) $(LIB_CPP_SRC:.cpp=.o) ALL = \ jsonnet \ @@ -100,9 +100,7 @@ test: jsonnet libjsonnet.so libjsonnet_test_snippet libjsonnet_test_file MAKEDEPEND_SRCS = \ cmd/jsonnet.cpp \ core/libjsonnet_test_snippet.c \ - core/libjsonnet_test_file.c \ - cpp/libjsonnet_cpp_test_snippet.c \ - cpp/libjsonnet_cpp_test_file.c + core/libjsonnet_test_file.c depend: makedepend -f- $(LIB_SRC) $(MAKEDEPEND_SRCS) > Makefile.depend @@ -113,9 +111,6 @@ core/desugarer.cpp: core/std.jsonnet.h %.o: %.cpp $(CXX) -c $(CXXFLAGS) $< -o $@ -%.o: %.cc - $(CXX) -c $(CXXFLAGS) $< -o $@ - # Commandline executable. jsonnet: cmd/jsonnet.cpp $(LIB_OBJ) $(CXX) $(CXXFLAGS) $(LDFLAGS) $< $(LIB_SRC:.cpp=.o) -o $@