- Changed master to 5.2.0.PRE

- Modified Makefiles for static linkage and coverage
- test namespace abstractions

apps/backend/Makefile.in

@@ -39,13 +39,11 @@ top_srcdir  	= @top_srcdir@
 CC		= @CC@
 CFLAGS  	= @CFLAGS@ 
 LINKAGE         = @LINKAGE@
-ifeq ($(LINKAGE),static)
-	CPPFLAGS  	= @CPPFLAGS@
-	SH_SUFFIX	= a
-else
-	CPPFLAGS  	= @CPPFLAGS@ -fPIC
-	SH_SUFFIX	= @SH_SUFFIX@
+CPPFLAGS  	= @CPPFLAGS@
+ifeq ($(LINKAGE),dynamic)
+CPPFLAGS       	+= -fPIC
 endif
+SH_SUFFIX	= @SH_SUFFIX@
 INSTALLFLAGS  	= @INSTALLFLAGS@ 
 LDFLAGS 	= @LDFLAGS@
 
@@ -65,7 +63,7 @@ CLIXON_MINOR    = @CLIXON_VERSION_MINOR@
 
 # Use this clixon lib for linking
 ifeq ($(LINKAGE),static)
-	CLIXON_LIB	= libclixon.a
+	CLIXON_LIB	= libclixon$(SH_SUFFIX)
 else
 	CLIXON_LIB	= libclixon$(SH_SUFFIX).$(CLIXON_MAJOR).$(CLIXON_MINOR)
 endif

apps/cli/Makefile.in

@@ -39,17 +39,15 @@ top_srcdir  	= @top_srcdir@
 CC		= @CC@
 CFLAGS  	= @CFLAGS@ 
 LINKAGE         = @LINKAGE@
+CPPFLAGS  	= @CPPFLAGS@
 ifeq ($(LINKAGE),dynamic)
-	CPPFLAGS  	= @CPPFLAGS@ -fPIC
-else
-	CPPFLAGS  	= @CPPFLAGS@
+	CPPFLAGS  	+= -fPIC
 endif
 SH_SUFFIX	= @SH_SUFFIX@
 INSTALLFLAGS  	= @INSTALLFLAGS@ 
-ifeq ($(LINKAGE),dynamic)
-	LDFLAGS 	= @LDFLAGS@
-else
-	LDFLAGS 	= @LDFLAGS@  -rdynamic -L.
+LDFLAGS 	= @LDFLAGS@	
+ifeq ($(LINKAGE),static)
+LDFLAGS 	+=  -rdynamic -L.
 endif
 
 prefix 		= @prefix@

apps/restconf/Makefile.in

@@ -92,7 +92,6 @@ APPL	  = clixon_restconf
 # Common source - not accessible from plugin - independent of restconf package (fcgi|native)
 APPSRC    =
 APPSRC   += restconf_api.c # maybe empty
-APPSRC   += restconf_api_$(with_restconf).c 
 APPSRC   += restconf_err.c 
 APPSRC   += restconf_methods.c
 APPSRC   += restconf_methods_post.c
@@ -114,6 +113,7 @@ APPOBJ    = $(APPSRC:.c=.o)
 # are not in the lib.
 LIBSRC    = restconf_lib.c
 LIBSRC   += restconf_handle.c 
+LIBSRC   += restconf_api_$(with_restconf).c 
 
 LIBOBJ    = $(LIBSRC:.c=.o)
 

apps/restconf/restconf_main_native.c

@@ -1773,7 +1773,7 @@ main(int    argc,
 			   ) < 0)
 	goto done;
     clicon_debug_init(dbg, NULL); 
-    clicon_log(LOG_NOTICE, "%s openssl: %u Started", __PROGRAM__, getpid());
+    clicon_log(LOG_NOTICE, "%s native %u Started", __PROGRAM__, getpid());
     if (set_signal(SIGTERM, restconf_sig_term, NULL) < 0){
 	clicon_err(OE_DAEMON, errno, "Setting signal");
 	goto done;