git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Small improvements to mixed source code type support
91649ecAndy Arvanitis
support/Makefile+13−7
compare with golang
unifiedsplit
@@ -66,14 +66,16 @@ $(PURESCRIPT_PKGS):
66
66
67SRCS := $(call rwildcard,$(CC_SRC)/,*.cpp)
67SRCS := $(call rwildcard,$(CC_SRC)/,*.cpp)
68SRCS += $(call rwildcard,$(FFI_SRC)/,*.cpp)
68SRCS += $(call rwildcard,$(FFI_SRC)/,*.cpp)
69+SRCS += $(call rwildcard,$(FFI_SRC)/,*.cc)
69SRCS += $(call rwildcard,$(FFI_SRC)/,*.mm)
70SRCS += $(call rwildcard,$(FFI_SRC)/,*.mm)
70SRCS += $(call rwildcard,$(FFI_SRC)/,*.c)
71SRCS += $(call rwildcard,$(FFI_SRC)/,*.c)
71SRCS += $(call rwildcard,$(FFI_SRC)/,*.m)
72SRCS += $(call rwildcard,$(FFI_SRC)/,*.m)
72
73
73OBJS1 = $(SRCS:.cpp=.o)
74OBJS1 = $(SRCS:.cpp=.o)
74−OBJS2 = $(OBJS1:.mm=.o)
75+OBJS2 = $(OBJS1:.cc=.o)
75−OBJS3 = $(OBJS2:.c=.o)
76+OBJS3 = $(OBJS2:.mm=.o)
77+OBJS4 = $(OBJS3:.c=.o)
76−OBJS = $(OBJS3:.m=.o)
78+OBJS = $(OBJS4:.m=.o)
77DEPS = $(OBJS:.o=.d)
79DEPS = $(OBJS:.o=.d)
78
80
79$(BIN): $(OBJS)
81$(BIN): $(OBJS)
@@ -84,19 +86,23 @@ $(BIN): $(OBJS)
84-include $(DEPS)
86-include $(DEPS)
85
87
86%.o: %.cpp
88%.o: %.cpp
87− @echo "Creating" $@
89+ @echo "Creating" $@ "(C++)"
90+ @$(CXX) $(CXXFLAGS) $(INCLUDES) -MMD -MP -c $< -o $@
91+
92+%.o: %.cc
93+ @echo "Creating" $@ "(C++)"
88 @$(CXX) $(CXXFLAGS) $(INCLUDES) -MMD -MP -c $< -o $@
94 @$(CXX) $(CXXFLAGS) $(INCLUDES) -MMD -MP -c $< -o $@
89
95
90%.o: %.mm
96%.o: %.mm
91− @echo "Creating" $@
97+ @echo "Creating" $@ "(Objective-C++)"
92 @$(CXX) $(CXXFLAGS) $(INCLUDES) -MMD -MP -c $< -o $@
98 @$(CXX) $(CXXFLAGS) $(INCLUDES) -MMD -MP -c $< -o $@
93
99
94%.o: %.c
100%.o: %.c
95− @echo "Creating" $@
101+ @echo "Creating" $@ "(C)"
96 @$(CXX) $(CFLAGS) $(INCLUDES) -MMD -MP -c $< -o $@
102 @$(CXX) $(CFLAGS) $(INCLUDES) -MMD -MP -c $< -o $@
97
103
98%.o: %.m
104%.o: %.m
99− @echo "Creating" $@
105+ @echo "Creating" $@ "(Objective-C)"
100 @$(CXX) $(CFLAGS) $(INCLUDES) -MMD -MP -c $< -o $@
106 @$(CXX) $(CFLAGS) $(INCLUDES) -MMD -MP -c $< -o $@
101
107
102.PHONY: all
108.PHONY: all