diff --git a/cpp/Makefile b/cpp/Makefile
index e2c9af47..cafe5501 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -255,7 +255,7 @@ ALL_DEPS := $(patsubst %.o,%.d,$(OBJ_S2PSERVICE_CORE) $(OBJ_S2PCTL_CORE) $(OBJ_S
 	$(OBJ_CONTROLLERS) $(OBJ_DEVICES) $(OBJ_S2P_TEST) $(OBJ_IN_PROCESS_TEST))
 -include $(ALL_DEPS)
 
-$(OBJ_GENERATED): $(SRC_GENERATED)
+$(OBJ_GENERATED): $(SRC_GENERATED) $(OBJDIR)
 $(LIB_SHARED): $(OBJ_SHARED)
 $(LIB_SHARED_PROTOBUF): $(OBJ_GENERATED) $(OBJ_SHARED_PROTOBUF) $(OBJ_SHARED)
 $(LIB_SHARED_COMMAND): $(OBJ_SHARED_COMMAND) $(OBJ_GENERATED) $(OBJ_SHARED_PROTOBUF) $(OBJ_SHARED)
@@ -272,7 +272,7 @@ $(LIB_SHARED) $(LIB_SHARED_PROTOBUF) $(LIB_SHARED_COMMAND) $(LIB_BUS) $(LIB_CONT
 $(OBJDIR)/%.o: %.cpp | $(OBJDIR)
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-$(OBJ_GENERATED): | $(OBJDIR)
+$(OBJ_GENERATED):
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 $(SRC_GENERATED):