diff --git a/sr_port/CMakeLists.txt b/sr_port/CMakeLists.txt
index dea242d..b8ce12b 100644
--- a/sr_port/CMakeLists.txt
+++ b/sr_port/CMakeLists.txt
@@ -1576,6 +1576,7 @@ set(GTM_DSE_SRC_C
   )
 
 set(GTM_GNPCLIENT_SRC_C
+  # The rest of the sources are in sr_port_cm
   callg_signal.c
   )
 
@@ -1625,7 +1626,7 @@ set(GTM_LKE_PORT_SRC_C
   lke_showtree.c
   )
 
-add_library(gnpclient
+add_library(gnpclientport
   ${GTM_GNPCLIENT_SRC_C}
   )
 
diff --git a/sr_port_cm/CMakeLists.txt b/sr_port_cm/CMakeLists.txt
index c469f94..fb29930 100644
--- a/sr_port_cm/CMakeLists.txt
+++ b/sr_port_cm/CMakeLists.txt
@@ -76,9 +76,7 @@ add_library(gtm_port_cm
   gtcmtr_lkcancel.c
   gtcmtr_lkdelete.c
   gtcmtr_lke_clearrep.c
-  gtcmtr_lke_clearreq.c
   gtcmtr_lke_showrep.c
-  gtcmtr_lke_showreq.c
   gtcmtr_lkreqimmed.c
   gtcmtr_lkreqnode.c
   gtcmtr_lkrequest.c
@@ -91,6 +89,11 @@ add_library(gtm_port_cm
   gtcmtr_terminate_free.c
   gtcmtr_zprevious.c
   gtcmtr_zwithdraw.c
+  )
+
+set(GTM_GNPCLIENT_PORT_CM_SRC_C
+  gtcmtr_lke_clearreq.c
+  gtcmtr_lke_showreq.c
   gvcmx_canremlk.c
   gvcmx_data.c
   gvcmx_get.c
@@ -127,3 +130,8 @@ add_library(gtm_port_cm
   gvcmz_zflush.c
   lock_cmtimeout.c
   )
+
+add_library(gnpclientportcm
+  ${GTM_GNPCLIENT_PORT_CM_SRC_C}
+  )
+