1.1 --- a/pkg/idl4re-examples/calc++/Makefile Sun Jul 05 00:46:04 2020 +0200
1.2 +++ b/pkg/idl4re-examples/calc++/Makefile Sun Jul 05 00:47:11 2020 +0200
1.3 @@ -23,23 +23,38 @@
1.4 CLIENT_INTERFACES_CC = calc counter
1.5 SERVER_INTERFACES_CC = calc counter
1.6
1.7 -SRC_CC_calc_client++ = \
1.8 - $(call interfaces_to_client_cc,$(CLIENT_INTERFACES_CC)) \
1.9 - client.cc \
1.10 - calc_local.cc \
1.11 +# Generated and plain source files.
1.12 +
1.13 +CLIENT_INTERFACES_SRC_CC_calc_client++ = $(call interfaces_to_client_cc,calc)
1.14 +SERVER_INTERFACES_SRC_CC_calc_server++ = $(call interfaces_to_server_cc,calc)
1.15 +CLIENT_INTERFACES_SRC_CC_calc_counter_client++ = $(call interfaces_to_client_cc,calc counter)
1.16
1.17 -SRC_CC_calc_server++ = \
1.18 - $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC)) \
1.19 - server.cc \
1.20 +SERVER_INTERFACES_SRC_CC_calc_counter_server++ = \
1.21 + $(call interfaces_to_server_cc,calc counter) \
1.22 + $(call interfaces_to_server_cc,calc_counter)
1.23 +
1.24 +PLAIN_SRC_CC_calc_client++ = client.cc calc_local.cc
1.25 +PLAIN_SRC_CC_calc_server++ = server.cc
1.26 +PLAIN_SRC_CC_calc_counter_client++ = client_compound.cc
1.27 +PLAIN_SRC_CC_calc_counter_server++ = server_compound.cc
1.28
1.29 -SRC_CC_calc_counter_client++ = \
1.30 - $(call interfaces_to_client_cc,$(CLIENT_INTERFACES_CC)) \
1.31 - client_compound.cc \
1.32 +# Normal definitions.
1.33 +
1.34 +SRC_CC_calc_client++ = \
1.35 + $(CLIENT_INTERFACES_SRC_CC_calc_client++) \
1.36 + $(PLAIN_SRC_CC_calc_client++)
1.37
1.38 -SRC_CC_calc_counter_server++ = \
1.39 - $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC)) \
1.40 - $(call interfaces_to_server_cc,$(COMP_INTERFACES_CC)) \
1.41 - server_compound.cc \
1.42 +SRC_CC_calc_server++ = \
1.43 + $(SERVER_INTERFACES_SRC_CC_calc_server++) \
1.44 + $(PLAIN_SRC_CC_calc_server++)
1.45 +
1.46 +SRC_CC_calc_counter_client++ = \
1.47 + $(CLIENT_INTERFACES_SRC_CC_calc_counter_client++) \
1.48 + $(PLAIN_SRC_CC_calc_counter_client++)
1.49 +
1.50 +SRC_CC_calc_counter_server++ = \
1.51 + $(SERVER_INTERFACES_SRC_CC_calc_counter_server++) \
1.52 + $(PLAIN_SRC_CC_calc_counter_server++)
1.53
1.54 REQUIRES_LIBS = l4re_c-util libipc
1.55
1.56 @@ -47,3 +62,8 @@
1.57
1.58 include $(L4DIR)/mk/prog.mk
1.59 include $(IDL_MK_DIR)/interface_rules.mk
1.60 +
1.61 +$(PLAIN_SRC_CC_calc_client++): $(CLIENT_INTERFACES_SRC_CC_calc_client++)
1.62 +$(PLAIN_SRC_CC_calc_server++): $(SERVER_INTERFACES_SRC_CC_calc_server++)
1.63 +$(PLAIN_SRC_CC_calc_counter_client++): $(CLIENT_INTERFACES_SRC_CC_calc_counter_client++)
1.64 +$(PLAIN_SRC_CC_calc_counter_server++): $(SERVER_INTERFACES_SRC_CC_calc_counter_server++)
2.1 --- a/pkg/idl4re-examples/calc/Makefile Sun Jul 05 00:46:04 2020 +0200
2.2 +++ b/pkg/idl4re-examples/calc/Makefile Sun Jul 05 00:47:11 2020 +0200
2.3 @@ -23,23 +23,38 @@
2.4 CLIENT_INTERFACES_C = calc counter
2.5 SERVER_INTERFACES_C = calc counter
2.6
2.7 +# Generated and plain source files.
2.8 +
2.9 +CLIENT_INTERFACES_SRC_C_calc_client = $(call interfaces_to_client_c,calc)
2.10 +CLIENT_INTERFACES_SRC_C_calc_counter_client = $(call interfaces_to_client_c,calc counter)
2.11 +SERVER_INTERFACES_SRC_C_calc_server = $(call interfaces_to_server_c,calc)
2.12 +
2.13 +SERVER_INTERFACES_SRC_C_calc_counter_server = \
2.14 + $(call interfaces_to_server_c,calc counter) \
2.15 + $(call interfaces_to_server_c,calc_counter)
2.16 +
2.17 +PLAIN_SRC_C_calc_client = client.c calc_local.c
2.18 +PLAIN_SRC_C_calc_server = server.c
2.19 +PLAIN_SRC_C_calc_counter_client = client_compound.c
2.20 +PLAIN_SRC_C_calc_counter_server = server_compound.c
2.21 +
2.22 +# Normal definitions.
2.23 +
2.24 SRC_C_calc_client = \
2.25 - $(call interfaces_to_client_c,$(CLIENT_INTERFACES_C)) \
2.26 - client.c \
2.27 - calc_local.c \
2.28 + $(CLIENT_INTERFACES_SRC_C_calc_client) \
2.29 + $(PLAIN_SRC_C_calc_client)
2.30
2.31 SRC_C_calc_server = \
2.32 - $(call interfaces_to_server_c,$(SERVER_INTERFACES_C)) \
2.33 - server.c \
2.34 + $(SERVER_INTERFACES_SRC_C_calc_server) \
2.35 + $(PLAIN_SRC_C_calc_server)
2.36
2.37 SRC_C_calc_counter_client = \
2.38 - $(call interfaces_to_client_c,$(CLIENT_INTERFACES_C)) \
2.39 - client_compound.c \
2.40 + $(CLIENT_INTERFACES_SRC_C_calc_counter_client) \
2.41 + $(PLAIN_SRC_C_calc_counter_client)
2.42
2.43 SRC_C_calc_counter_server = \
2.44 - $(call interfaces_to_server_c,$(SERVER_INTERFACES_C)) \
2.45 - $(call interfaces_to_server_c,$(COMP_INTERFACES_C)) \
2.46 - server_compound.c \
2.47 + $(SERVER_INTERFACES_SRC_C_calc_counter_server) \
2.48 + $(PLAIN_SRC_C_calc_counter_server)
2.49
2.50 REQUIRES_LIBS = l4re_c-util libipc
2.51
2.52 @@ -47,3 +62,8 @@
2.53
2.54 include $(L4DIR)/mk/prog.mk
2.55 include $(IDL_MK_DIR)/interface_rules.mk
2.56 +
2.57 +$(PLAIN_SRC_C_calc_client): $(CLIENT_INTERFACES_SRC_C_calc_client)
2.58 +$(PLAIN_SRC_C_calc_server): $(SERVER_INTERFACES_SRC_C_calc_server)
2.59 +$(PLAIN_SRC_C_calc_counter_client): $(CLIENT_INTERFACES_SRC_C_calc_counter_client)
2.60 +$(PLAIN_SRC_C_calc_counter_server): $(SERVER_INTERFACES_SRC_C_calc_counter_server)