Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Makefile, correcting filenames and removing missing files. #146

Merged
merged 1 commit into from
Mar 28, 2016
Merged

Fix Makefile, correcting filenames and removing missing files. #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand All @@ -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 $@
Expand Down