Skip to content

Commit 36defe1

Browse files
d-ledd-led
committed
2 parents 71e44e2 + 0c66965 commit 36defe1

File tree

9 files changed

+193
-257
lines changed

9 files changed

+193
-257
lines changed

‎build/macosx/gmake/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,4 @@ help:
122122
@echo " test-influxdb-cpp-rest"
123123
@echo " test-influxdb-cpp-auth"
124124
@echo ""
125-
@echo "For more information, see http://industriousone.com/premake/quick-start"
125+
@echo "For more information, see https://github.com/premake/premake-core/wiki"

‎build/macosx/gmake/demo.make‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ifeq ($(config),debug_x32)
2424
TARGET = $(TARGETDIR)/demo
2525
OBJDIR = ../../../obj/macosx/gmake/x32/Debug/demo
2626
DEFINES += -D_DEBUG
27-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
27+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
2828
FORCE_INCLUDE +=
2929
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
3030
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -fPIC -g -std=c++14
@@ -59,7 +59,7 @@ ifeq ($(config),debug_x64)
5959
TARGET = $(TARGETDIR)/demo
6060
OBJDIR = ../../../obj/macosx/gmake/x64/Debug/demo
6161
DEFINES += -D_DEBUG
62-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
62+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
6363
FORCE_INCLUDE +=
6464
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
6565
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g -std=c++14
@@ -94,7 +94,7 @@ ifeq ($(config),release_x32)
9494
TARGET = $(TARGETDIR)/demo
9595
OBJDIR = ../../../obj/macosx/gmake/x32/Release/demo
9696
DEFINES +=
97-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
97+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
9898
FORCE_INCLUDE +=
9999
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
100100
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fPIC -std=c++14
@@ -129,7 +129,7 @@ ifeq ($(config),release_x64)
129129
TARGET = $(TARGETDIR)/demo
130130
OBJDIR = ../../../obj/macosx/gmake/x64/Release/demo
131131
DEFINES +=
132-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
132+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
133133
FORCE_INCLUDE +=
134134
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
135135
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC -std=c++14
@@ -157,23 +157,33 @@ RESOURCES := \
157157

158158
CUSTOMFILES := \
159159

160-
SHELLTYPE := msdos
161-
ifeq (,$(ComSpec)$(COMSPEC))
162-
SHELLTYPE := posix
163-
endif
164-
ifeq (/bin,$(findstring /bin,$(SHELL)))
165-
SHELLTYPE := posix
160+
SHELLTYPE := posix
161+
ifeq (.exe,$(findstring .exe,$(ComSpec)))
162+
SHELLTYPE := msdos
166163
endif
167164

168-
$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
165+
$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
169166
@echo Linking demo
167+
$(SILENT) $(LINKCMD)
168+
$(POSTBUILDCMDS)
169+
170+
$(CUSTOMFILES): | $(OBJDIR)
171+
172+
$(TARGETDIR):
173+
@echo Creating $(TARGETDIR)
170174
ifeq (posix,$(SHELLTYPE))
171175
$(SILENT) mkdir -p $(TARGETDIR)
172176
else
173177
$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
174178
endif
175-
$(SILENT) $(LINKCMD)
176-
$(POSTBUILDCMDS)
179+
180+
$(OBJDIR):
181+
@echo Creating $(OBJDIR)
182+
ifeq (posix,$(SHELLTYPE))
183+
$(SILENT) mkdir -p $(OBJDIR)
184+
else
185+
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
186+
endif
177187

178188
clean:
179189
@echo Cleaning demo
@@ -192,24 +202,16 @@ prelink:
192202
$(PRELINKCMDS)
193203

194204
ifneq (,$(PCH))
195-
$(OBJECTS): $(GCH) $(PCH)
196-
$(GCH): $(PCH)
205+
$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
206+
$(GCH): $(PCH) | $(OBJDIR)
197207
@echo $(notdir $<)
198-
ifeq (posix,$(SHELLTYPE))
199-
$(SILENT) mkdir -p $(OBJDIR)
200-
else
201-
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
202-
endif
203208
$(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
209+
else
210+
$(OBJECTS): | $(OBJDIR)
204211
endif
205212

206213
$(OBJDIR)/main.o: ../../../src/demo/main.cpp
207214
@echo $(notdir $<)
208-
ifeq (posix,$(SHELLTYPE))
209-
$(SILENT) mkdir -p $(OBJDIR)
210-
else
211-
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
212-
endif
213215
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
214216

215217
-include $(OBJECTS:%.o=%.d)

‎build/macosx/gmake/fmt.make‎

Lines changed: 29 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ifeq ($(config),debug_x32)
2424
TARGET = $(TARGETDIR)/libfmt.a
2525
OBJDIR = ../../../obj/macosx/gmake/x32/Debug/fmt
2626
DEFINES += -D_DEBUG
27-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
27+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
2828
FORCE_INCLUDE +=
2929
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
3030
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -fPIC -g -std=c++14
@@ -59,7 +59,7 @@ ifeq ($(config),debug_x64)
5959
TARGET = $(TARGETDIR)/libfmt.a
6060
OBJDIR = ../../../obj/macosx/gmake/x64/Debug/fmt
6161
DEFINES += -D_DEBUG
62-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
62+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
6363
FORCE_INCLUDE +=
6464
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
6565
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g -std=c++14
@@ -94,7 +94,7 @@ ifeq ($(config),release_x32)
9494
TARGET = $(TARGETDIR)/libfmt.a
9595
OBJDIR = ../../../obj/macosx/gmake/x32/Release/fmt
9696
DEFINES +=
97-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
97+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
9898
FORCE_INCLUDE +=
9999
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
100100
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fPIC -std=c++14
@@ -129,7 +129,7 @@ ifeq ($(config),release_x64)
129129
TARGET = $(TARGETDIR)/libfmt.a
130130
OBJDIR = ../../../obj/macosx/gmake/x64/Release/fmt
131131
DEFINES +=
132-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
132+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
133133
FORCE_INCLUDE +=
134134
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
135135
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC -std=c++14
@@ -152,31 +152,39 @@ endif
152152

153153
OBJECTS := \
154154
$(OBJDIR)/format.o \
155-
$(OBJDIR)/ostream.o \
156155
$(OBJDIR)/posix.o \
157-
$(OBJDIR)/printf.o \
158156

159157
RESOURCES := \
160158

161159
CUSTOMFILES := \
162160

163-
SHELLTYPE := msdos
164-
ifeq (,$(ComSpec)$(COMSPEC))
165-
SHELLTYPE := posix
166-
endif
167-
ifeq (/bin,$(findstring /bin,$(SHELL)))
168-
SHELLTYPE := posix
161+
SHELLTYPE := posix
162+
ifeq (.exe,$(findstring .exe,$(ComSpec)))
163+
SHELLTYPE := msdos
169164
endif
170165

171-
$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
166+
$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
172167
@echo Linking fmt
168+
$(SILENT) $(LINKCMD)
169+
$(POSTBUILDCMDS)
170+
171+
$(CUSTOMFILES): | $(OBJDIR)
172+
173+
$(TARGETDIR):
174+
@echo Creating $(TARGETDIR)
173175
ifeq (posix,$(SHELLTYPE))
174176
$(SILENT) mkdir -p $(TARGETDIR)
175177
else
176178
$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
177179
endif
178-
$(SILENT) $(LINKCMD)
179-
$(POSTBUILDCMDS)
180+
181+
$(OBJDIR):
182+
@echo Creating $(OBJDIR)
183+
ifeq (posix,$(SHELLTYPE))
184+
$(SILENT) mkdir -p $(OBJDIR)
185+
else
186+
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
187+
endif
180188

181189
clean:
182190
@echo Cleaning fmt
@@ -195,48 +203,19 @@ prelink:
195203
$(PRELINKCMDS)
196204

197205
ifneq (,$(PCH))
198-
$(OBJECTS): $(GCH) $(PCH)
199-
$(GCH): $(PCH)
206+
$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
207+
$(GCH): $(PCH) | $(OBJDIR)
200208
@echo $(notdir $<)
201-
ifeq (posix,$(SHELLTYPE))
202-
$(SILENT) mkdir -p $(OBJDIR)
203-
else
204-
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
205-
endif
206209
$(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
207-
endif
208-
209-
$(OBJDIR)/format.o: ../../../deps/fmt/fmt/format.cc
210-
@echo $(notdir $<)
211-
ifeq (posix,$(SHELLTYPE))
212-
$(SILENT) mkdir -p $(OBJDIR)
213210
else
214-
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
211+
$(OBJECTS): | $(OBJDIR)
215212
endif
216-
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
217-
$(OBJDIR)/ostream.o: ../../../deps/fmt/fmt/ostream.cc
213+
214+
$(OBJDIR)/format.o: ../../../deps/fmt/src/format.cc
218215
@echo $(notdir $<)
219-
ifeq (posix,$(SHELLTYPE))
220-
$(SILENT) mkdir -p $(OBJDIR)
221-
else
222-
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
223-
endif
224216
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
225-
$(OBJDIR)/posix.o: ../../../deps/fmt/fmt/posix.cc
217+
$(OBJDIR)/posix.o: ../../../deps/fmt/src/posix.cc
226218
@echo $(notdir $<)
227-
ifeq (posix,$(SHELLTYPE))
228-
$(SILENT) mkdir -p $(OBJDIR)
229-
else
230-
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
231-
endif
232-
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
233-
$(OBJDIR)/printf.o: ../../../deps/fmt/fmt/printf.cc
234-
@echo $(notdir $<)
235-
ifeq (posix,$(SHELLTYPE))
236-
$(SILENT) mkdir -p $(OBJDIR)
237-
else
238-
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
239-
endif
240219
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
241220

242221
-include $(OBJECTS:%.o=%.d)

‎build/macosx/gmake/influx-c-rest.make‎

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ifeq ($(config),debug_x32)
2424
TARGET = $(TARGETDIR)/libinflux-c-rest.dylib
2525
OBJDIR = ../../../obj/macosx/gmake/x32/Debug/influx-c-rest
2626
DEFINES += -D_DEBUG -DBUILDING_INFLUX_C_REST
27-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
27+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
2828
FORCE_INCLUDE +=
2929
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
3030
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -fPIC -g -std=c++14
@@ -59,7 +59,7 @@ ifeq ($(config),debug_x64)
5959
TARGET = $(TARGETDIR)/libinflux-c-rest.dylib
6060
OBJDIR = ../../../obj/macosx/gmake/x64/Debug/influx-c-rest
6161
DEFINES += -D_DEBUG -DBUILDING_INFLUX_C_REST
62-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
62+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
6363
FORCE_INCLUDE +=
6464
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
6565
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g -std=c++14
@@ -94,7 +94,7 @@ ifeq ($(config),release_x32)
9494
TARGET = $(TARGETDIR)/libinflux-c-rest.dylib
9595
OBJDIR = ../../../obj/macosx/gmake/x32/Release/influx-c-rest
9696
DEFINES += -DBUILDING_INFLUX_C_REST
97-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
97+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
9898
FORCE_INCLUDE +=
9999
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
100100
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fPIC -std=c++14
@@ -129,7 +129,7 @@ ifeq ($(config),release_x64)
129129
TARGET = $(TARGETDIR)/libinflux-c-rest.dylib
130130
OBJDIR = ../../../obj/macosx/gmake/x64/Release/influx-c-rest
131131
DEFINES += -DBUILDING_INFLUX_C_REST
132-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
132+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/usr/local/include -I/usr/local/opt/openssl/include
133133
FORCE_INCLUDE +=
134134
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
135135
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC -std=c++14
@@ -158,23 +158,33 @@ RESOURCES := \
158158

159159
CUSTOMFILES := \
160160

161-
SHELLTYPE := msdos
162-
ifeq (,$(ComSpec)$(COMSPEC))
163-
SHELLTYPE := posix
164-
endif
165-
ifeq (/bin,$(findstring /bin,$(SHELL)))
166-
SHELLTYPE := posix
161+
SHELLTYPE := posix
162+
ifeq (.exe,$(findstring .exe,$(ComSpec)))
163+
SHELLTYPE := msdos
167164
endif
168165

169-
$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
166+
$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
170167
@echo Linking influx-c-rest
168+
$(SILENT) $(LINKCMD)
169+
$(POSTBUILDCMDS)
170+
171+
$(CUSTOMFILES): | $(OBJDIR)
172+
173+
$(TARGETDIR):
174+
@echo Creating $(TARGETDIR)
171175
ifeq (posix,$(SHELLTYPE))
172176
$(SILENT) mkdir -p $(TARGETDIR)
173177
else
174178
$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
175179
endif
176-
$(SILENT) $(LINKCMD)
177-
$(POSTBUILDCMDS)
180+
181+
$(OBJDIR):
182+
@echo Creating $(OBJDIR)
183+
ifeq (posix,$(SHELLTYPE))
184+
$(SILENT) mkdir -p $(OBJDIR)
185+
else
186+
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
187+
endif
178188

179189
clean:
180190
@echo Cleaning influx-c-rest
@@ -193,32 +203,19 @@ prelink:
193203
$(PRELINKCMDS)
194204

195205
ifneq (,$(PCH))
196-
$(OBJECTS): $(GCH) $(PCH)
197-
$(GCH): $(PCH)
206+
$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
207+
$(GCH): $(PCH) | $(OBJDIR)
198208
@echo $(notdir $<)
199-
ifeq (posix,$(SHELLTYPE))
200-
$(SILENT) mkdir -p $(OBJDIR)
201-
else
202-
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
203-
endif
204209
$(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
210+
else
211+
$(OBJECTS): | $(OBJDIR)
205212
endif
206213

207214
$(OBJDIR)/influx_c_rest_async.o: ../../../src/influx-c-rest/influx_c_rest_async.cpp
208215
@echo $(notdir $<)
209-
ifeq (posix,$(SHELLTYPE))
210-
$(SILENT) mkdir -p $(OBJDIR)
211-
else
212-
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
213-
endif
214216
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
215217
$(OBJDIR)/influx_c_rest_query.o: ../../../src/influx-c-rest/influx_c_rest_query.cpp
216218
@echo $(notdir $<)
217-
ifeq (posix,$(SHELLTYPE))
218-
$(SILENT) mkdir -p $(OBJDIR)
219-
else
220-
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
221-
endif
222219
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
223220

224221
-include $(OBJECTS:%.o=%.d)

0 commit comments

Comments
 (0)