Only install pkg-config files for libraries that are installed

Resolves #549

Makefile.in

@@ -339,7 +339,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  += riscv-$(1).pc
+install_pcs  += $$(if $$($(2)_install_lib),riscv-$(1).pc,)
 
 endef
 

configure

@@ -5262,20 +5262,8 @@ ac_config_headers="$ac_config_headers config.h"
 
 ac_config_files="$ac_config_files Makefile"
 
-ac_config_files="$ac_config_files riscv-spike.pc"
-
-ac_config_files="$ac_config_files riscv-riscv.pc"
-
 ac_config_files="$ac_config_files riscv-fesvr.pc"
 
-ac_config_files="$ac_config_files riscv-softfloat.pc"
-
-ac_config_files="$ac_config_files riscv-customext.pc"
-
-ac_config_files="$ac_config_files riscv-fdt.pc"
-
-ac_config_files="$ac_config_files riscv-spike_main.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
@@ -5977,13 +5965,7 @@ do
     "spike_dasm.mk") CONFIG_FILES="$CONFIG_FILES spike_dasm.mk:spike_dasm/spike_dasm.mk.in" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "riscv-spike.pc") CONFIG_FILES="$CONFIG_FILES riscv-spike.pc" ;;
-    "riscv-riscv.pc") CONFIG_FILES="$CONFIG_FILES riscv-riscv.pc" ;;
     "riscv-fesvr.pc") CONFIG_FILES="$CONFIG_FILES riscv-fesvr.pc" ;;
-    "riscv-softfloat.pc") CONFIG_FILES="$CONFIG_FILES riscv-softfloat.pc" ;;
-    "riscv-customext.pc") CONFIG_FILES="$CONFIG_FILES riscv-customext.pc" ;;
-    "riscv-fdt.pc") CONFIG_FILES="$CONFIG_FILES riscv-fdt.pc" ;;
-    "riscv-spike_main.pc") CONFIG_FILES="$CONFIG_FILES riscv-spike_main.pc" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

configure.ac

@@ -115,11 +115,5 @@ MCPPBS_SUBPROJECTS([ fesvr, riscv, disasm, customext, fdt, softfloat, spike_main
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([riscv-spike.pc])
-AC_CONFIG_FILES([riscv-riscv.pc])
 AC_CONFIG_FILES([riscv-fesvr.pc])
-AC_CONFIG_FILES([riscv-softfloat.pc])
-AC_CONFIG_FILES([riscv-customext.pc])
-AC_CONFIG_FILES([riscv-fdt.pc])
-AC_CONFIG_FILES([riscv-spike_main.pc])
 AC_OUTPUT

riscv-customext.pc.in

@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@prefix@
-libdir=${prefix}/@libdir@
-includedir=${prefix}/@includedir@
-
-Name: riscv-customext
-Description: Example RISC-V ROCC accelerator
-Version: git
-Libs: -Wl,-rpath,${libdir} -L${libdir} -lcustomext
-Cflags: -I${includedir}
-URL: http://riscv.org/download.html#tab_spike

riscv-fdt.pc.in

@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@prefix@
-libdir=${prefix}/@libdir@
-includedir=${prefix}/@includedir@
-
-Name: riscv-fdt
-Description: Simple fdt library from opensbit
-Version: git
-Libs: -Wl,-rpath,${libdir} -L${libdir} -lfdt
-Cflags: -I${includedir}
-URL: http://riscv.org/download.html#tab_spike

riscv-riscv.pc.in

@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@prefix@
-libdir=${prefix}/@libdir@
-includedir=${prefix}/@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

riscv-softfloat.pc.in

@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@prefix@
-libdir=${prefix}/@libdir@
-includedir=${prefix}/@includedir@
-
-Name: riscv-softfloat
-Description: RISC-V softfloat library
-Version: git
-Libs: -Wl,-rpath,${libdir} -L${libdir} -lsoftfloat
-Cflags: -I${includedir}
-URL: http://riscv.org/download.html#tab_spike

riscv-spike.pc.in

@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@prefix@
-libdir=${prefix}/@libdir@
-includedir=${prefix}/@includedir@
-
-Name: riscv-spike
-Description: RISC-V spike meta library
-Version: git
-Depends: riscv-spike_main riscv-riscv riscv-softfloat riscv-fdt
-URL: http://riscv.org/download.html#tab_spike

riscv-spike_main.pc.in

@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@prefix@
-libdir=${prefix}/@libdir@
-includedir=${prefix}/@includedir@
-
-Name: riscv-spike_main
-Description: RISC-V ISA simulator library
-Version: git
-Depends: riscv-riscv riscv-softfloat riscv-fdt
-Libs: -Wl,-rpath,${libdir} -L${libdir} -lspike_main
-Cflags: -I${includedir}
-URL: http://riscv.org/download.html#tab_spike