diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | disasm/disasm.mk.in | 2 | ||||
| -rw-r--r-- | fesvr/fesvr.mk.in | 2 | ||||
| -rw-r--r-- | riscv-riscv.pc.in | 11 | ||||
| -rw-r--r-- | riscv/riscv.mk.in | 2 |
7 files changed, 22 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index c3e1822..c922e84 100644 --- a/Makefile.in +++ b/Makefile.in @@ -337,7 +337,7 @@ install_hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_install_hdrs)) install_libs += $$(if $$($(2)_install_lib),lib$(1).a,) install_libs += $$(if $$($(2)_install_shared_lib),lib$(1).so,) install_exes += $$($(2)_install_prog_exes) -install_pcs += $$(if $$($(2)_install_lib),riscv-$(1).pc,) +install_pcs += $$(if $$($(2)_install_pcs),riscv-$(1).pc,) endef @@ -6362,6 +6362,8 @@ ac_config_files="$ac_config_files riscv-fesvr.pc" ac_config_files="$ac_config_files riscv-disasm.pc" +ac_config_files="$ac_config_files riscv-riscv.pc" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -7065,6 +7067,7 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "riscv-fesvr.pc") CONFIG_FILES="$CONFIG_FILES riscv-fesvr.pc" ;; "riscv-disasm.pc") CONFIG_FILES="$CONFIG_FILES riscv-disasm.pc" ;; + "riscv-riscv.pc") CONFIG_FILES="$CONFIG_FILES riscv-riscv.pc" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 13797a0..1b46578 100644 --- a/configure.ac +++ b/configure.ac @@ -123,4 +123,5 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([riscv-fesvr.pc]) AC_CONFIG_FILES([riscv-disasm.pc]) +AC_CONFIG_FILES([riscv-riscv.pc]) AC_OUTPUT diff --git a/disasm/disasm.mk.in b/disasm/disasm.mk.in index 9eafb12..445c430 100644 --- a/disasm/disasm.mk.in +++ b/disasm/disasm.mk.in @@ -3,3 +3,5 @@ disasm_srcs = \ regnames.cc \ disasm_install_lib = yes + +disasm_install_pcs = yes diff --git a/fesvr/fesvr.mk.in b/fesvr/fesvr.mk.in index e0d143f..f4b154d 100644 --- a/fesvr/fesvr.mk.in +++ b/fesvr/fesvr.mk.in @@ -19,6 +19,8 @@ fesvr_install_config_hdr = yes fesvr_install_lib = yes +fesvr_install_pcs = yes + fesvr_srcs = \ elfloader.cc \ htif.cc \ diff --git a/riscv-riscv.pc.in b/riscv-riscv.pc.in new file mode 100644 index 0000000..852ac83 --- /dev/null +++ b/riscv-riscv.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: riscv-riscv +Description: RISC-V +Version: git +Libs: -Wl,-rpath,${libdir} -L${libdir} -lriscv +Cflags: -I${includedir} +URL: http://riscv.org/download.html#tab_spike diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in index 561e197..55fadc0 100644 --- a/riscv/riscv.mk.in +++ b/riscv/riscv.mk.in @@ -11,6 +11,8 @@ riscv_CFLAGS = -fPIC riscv_install_shared_lib = yes +riscv_install_pcs = yes + riscv_install_prog_srcs = \ riscv_install_hdrs = \ |