Commit 1d4ec19e authored by ml's avatar ml

*** empty log message ***

parent dd4cba1c
......@@ -498,19 +498,19 @@ typedef struct {
} gdb_sCclassVolume;
#if 0
/** Cached Attribute
*/
typedef struct {
} ndc_sAttribute;
#endif
typedef struct {
net_sCattribute g;
ndc_sAttribute conv;
// ndc_sAttribute conv;
} gdb_sCattribute;
......
......@@ -33,6 +33,7 @@ vpath %.hpp $(hw_source):$(os_source):$(co_source)
vpath %.c $(hw_source):$(os_source):$(co_source)
vpath %.cpp $(hw_source):$(os_source):$(co_source)
vpath %.x $(hw_source):$(os_source):$(co_source)
vpath %.pdr $(hw_source):$(os_source):$(co_source)
source_dirs = $(hw_source) $(os_source) $(co_source)
......@@ -72,12 +73,23 @@ xdr_sources := $(sort \
) \
)
pdr_sources := $(sort \
$(foreach file, \
$(foreach dir, \
$(source_dirs), \
$(wildcard $(dir)/$(comp_name)*.pdr) \
), $(notdir $(file)) \
) \
)
xdr_includes := $(addprefix $(inc_dir)/,$(patsubst %.x, %.h, $(xdr_sources)))
xdr_objects := $(patsubst %.x, %_xdr.o, $(xdr_sources))
pdr_includes := $(addprefix $(inc_dir)/,$(patsubst %.pdr, %.h, $(pdr_sources)))
pdr_objects := $(patsubst %.pdr, %_pdr.o, $(pdr_sources))
export_includes := $(addprefix $(inc_dir)/,$(h_includes) $(hpp_includes))
export_includes += $(xdr_includes)
export_includes += $(xdr_includes) $(pdr_includes)
clean_h_includes := $(patsubst %.h,clean_%.h, $(h_includes))
clean_hpp_includes := $(patsubst %.hpp,clean_%.hpp, $(hpp_includes))
......@@ -87,10 +99,10 @@ lib_name := libpwr_$(comp_name)
export_lib := $(lib_dir)/$(lib_name)$(lib_ext)
objects := $(addsuffix $(obj_ext), $(basename $(sources)))
objects += $(xdr_objects)
objects += $(xdr_objects) $(pdr_objects)
objects := $(addprefix $(bld_dir)/, $(objects))
source_dependencies := $(notdir $(basename $(sources)))
source_dependencies := $(notdir $(basename $(sources) $(pdr_objects) $(xdr_objects)))
source_dependencies := $(addprefix $(bld_dir)/, $(source_dependencies))
source_dependencies := $(addsuffix $(d_ext), $(source_dependencies))
......
......@@ -124,15 +124,45 @@ endif
$(inc_dir)/%.h : %.x
@ $(log_x_h)
@ if [ -e $(target) ]; then \
$(rm) $(target); \
fi
@ rpcgen -h -o $(target) $(source)
$(bld_dir)/%_xdr.o : %.x
@ $(log_x_lib)
@ rpcgen -c -o $(bld_dir)/$(sname)_xdr.t $(source)
@ sed 's/\(#include "\)\(.*$(sname)[^"]*\)/\1$(sname).h/' $(bld_dir)/$(sname)_xdr.t > $(bld_dir)/$(sname)_xdr.c
@ sed 's/\(#include "\)\(.*$(sname)[^"]*\)/\1$(sname).h/' $(bld_dir)/$(sname)_xdr.t \
| grep -v "register int32_t \*buf\;"> $(bld_dir)/$(sname)_xdr.c
@ rm $(bld_dir)/$(sname)_xdr.t
ifeq ($(nodep),)
@ $(SHELL) -ec '$(cc) -MM $(cinc) $(csetos) $(bld_dir)/$(sname)_xdr.c \
| sed '\''s|$*_xdr\.o[ ]*|$(bld_dir)/&|g'\'' \
| sed '\''s|$(bld_dir)/$(sname)_xdr.c||'\'' > $(bld_dir)/$(sname)_xdr.d'
endif
@ $(cc) $(cflags) $(csetos) $(cinc) -c -o $(bld_dir)/$(sname)_xdr.o $(bld_dir)/$(sname)_xdr.c
@ mv $(bld_dir)/$(sname)_xdr.c $(bld_dir)/$(sname)_xdr_compiled.c
$(inc_dir)/%.h : %.pdr
@ $(log_x_h)
@ if [ -e $(target) ]; then \
$(rm) $(target); \
fi
@ tools_pdrgen -h -o $(target) $(source)
$(bld_dir)/%_pdr.o : %.pdr
@ $(log_x_lib)
@ tools_pdrgen -c -o $(bld_dir)/$(sname)_pdr.c $(source)
ifeq ($(nodep),)
@ $(SHELL) -ec '$(cc) -MM $(cinc) $(csetos) $(bld_dir)/$(sname)_pdr.c \
| sed '\''s|$*_pdr\.o[ ]*|$(bld_dir)/&|g'\'' \
| sed '\''s|$(bld_dir)/$(sname)_pdr.c||'\'' > $(bld_dir)/$(sname)_pdr.d'
endif
@ $(cc) $(cflags) $(csetos) $(cinc) -c -o $(bld_dir)/$(sname)_pdr.o $(bld_dir)/$(sname)_pdr.c
@ mv $(bld_dir)/$(sname)_pdr.c $(bld_dir)/$(sname)_pdr_compiled.c
(%.o) : %.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment