renamed .h and libs clicon->clixon

This commit is contained in:
Olof Hagsand 2016-02-28 15:27:36 +01:00
parent baa5611616
commit 79b77943f9
132 changed files with 1240 additions and 1268 deletions

View file

@ -36,27 +36,27 @@ sysconfdir = @sysconfdir@
includedir = @includedir@
SH_SUFFIX = @SH_SUFFIX@
CLICON_MAJOR = @CLICON_VERSION_MAJOR@
CLICON_MINOR = @CLICON_VERSION_MINOR@
CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@
CLIXON_MINOR = @CLIXON_VERSION_MINOR@
# Use this clicon lib for linking
CLICON_LIB = libclicon.so.$(CLICON_MAJOR).$(CLICON_MINOR)
# Use this clixon lib for linking
CLIXON_LIB = libclixon.so.$(CLIXON_MAJOR).$(CLIXON_MINOR)
# For dependency
LIBDEPS = $(top_srcdir)/lib/src/$(CLICON_LIB)
LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLICON_LIB)
LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLIXON_LIB)
CPPFLAGS = @CPPFLAGS@ -fPIC
INCLUDES = -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
APPL = clicon_netconf
APPL = clixon_netconf
SRC = netconf_main.c
OBJS = $(SRC:.c=.o)
MYNAME = clicon_netconf
MYNAME = clixon_netconf
MYLIBLINK = lib$(MYNAME)$(SH_SUFFIX)
MYLIB = $(MYLIBLINK).$(CLICON_MAJOR).$(CLICON_MINOR)
MYLIBSO = $(MYLIBLINK).$(CLICON_MAJOR)
MYLIB = $(MYLIBLINK).$(CLIXON_MAJOR).$(CLIXON_MINOR)
MYLIBSO = $(MYLIBLINK).$(CLIXON_MAJOR)
LIBSRC = netconf_hello.c netconf_rpc.c netconf_filter.c netconf_lib.c netconf_plugin.c
LIBOBJS = $(LIBSRC:.c=.o)
@ -80,17 +80,17 @@ install: install-lib $(APPL)
install-lib: $(MYLIB)
install -d $(DESTDIR)$(libdir)
install $(MYLIB) $(DESTDIR)$(libdir)
ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclicon_netconf.so.2
ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclicon_netconf.so
ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclixon_netconf.so.2
ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclixon_netconf.so
install-include: clicon_netconf.h
install -d $(DESTDIR)$(includedir)/clicon
install -m 644 $^ $(DESTDIR)$(includedir)/clicon
install-include: clixon_netconf.h
install -d $(DESTDIR)$(includedir)/clixon
install -m 644 $^ $(DESTDIR)$(includedir)/clixon
uninstall:
rm -f $(bindir)/$(APPL)
rm -f $(libdir)/$(MYLIB)
rm -f $(includedir)/clicon/*
rm -f $(includedir)/clixon/*
.SUFFIXES:
.SUFFIXES: .c .o
@ -104,7 +104,7 @@ $(APPL) : $(OBJS) $(MYLIBLINK) $(LIBDEPS)
$(MYLIB) : $(LIBOBJS)
$(CC) -shared -Wl,-soname,$(MYLIBSO) -o $@ $(LIBOBJS) $(LIBS) -Wl,-soname=$(MYLIBSO)
# link-name is needed for application linking, eg for clicon_cli and clicon_config
# link-name is needed for application linking, eg for clixon_cli and clixon_config
$(MYLIBLINK) : $(MYLIB)
# ln -sf $(MYLIB) $(MYLIBSO)
# ln -sf $(MYLIB) $@

View file

@ -2,20 +2,20 @@
*
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
This file is part of CLICON.
This file is part of CLIXON.
CLICON is free software; you can redistribute it and/or modify
CLIXON is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
CLICON is distributed in the hope that it will be useful,
CLIXON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with CLICON; see the file LICENSE. If not, see
along with CLIXON; see the file LICENSE. If not, see
<http://www.gnu.org/licenses/>.
*
@ -23,8 +23,8 @@
* should only include this file (not the netconf_*.h)
*/
#ifndef _CLICON_NETCONF_H_
#define _CLICON_NETCONF_H_
#ifndef _CLIXON_NETCONF_H_
#define _CLIXON_NETCONF_H_
/*
* Types
@ -70,4 +70,4 @@ int netconf_xpath(cxobj *xsearch,
cxobj *xt);
#endif /* _CLICON_NETCONF_H_ */
#endif /* _CLIXON_NETCONF_H_ */

View file

@ -2,27 +2,27 @@
*
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
This file is part of CLICON.
This file is part of CLIXON.
CLICON is free software; you can redistribute it and/or modify
CLIXON is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
CLICON is distributed in the hope that it will be useful,
CLIXON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with CLICON; see the file LICENSE. If not, see
along with CLIXON; see the file LICENSE. If not, see
<http://www.gnu.org/licenses/>.
*
* netconf match & selection: get and edit operations
*****************************************************************************/
#ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */
#include "clixon_config.h" /* generated by config & autoconf */
#endif
#include <stdio.h>
@ -46,7 +46,7 @@
#include <cligen/cligen.h>
/* clicon */
#include <clicon/clicon.h>
#include <clixon/clixon.h>
#include "netconf_rpc.h"
#include "netconf_lib.h"

View file

@ -2,20 +2,20 @@
*
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
This file is part of CLICON.
This file is part of CLIXON.
CLICON is free software; you can redistribute it and/or modify
CLIXON is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
CLICON is distributed in the hope that it will be useful,
CLIXON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with CLICON; see the file LICENSE. If not, see
along with CLIXON; see the file LICENSE. If not, see
<http://www.gnu.org/licenses/>.
*

View file

@ -2,20 +2,20 @@
*
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
This file is part of CLICON.
This file is part of CLIXON.
CLICON is free software; you can redistribute it and/or modify
CLIXON is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
CLICON is distributed in the hope that it will be useful,
CLIXON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with CLICON; see the file LICENSE. If not, see
along with CLIXON; see the file LICENSE. If not, see
<http://www.gnu.org/licenses/>.
*
@ -37,7 +37,7 @@
#ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */
#include "clixon_config.h" /* generated by config & autoconf */
#endif
#include <stdio.h>
@ -61,7 +61,7 @@
#include <cligen/cligen.h>
/* clicon */
#include <clicon/clicon.h>
#include <clixon/clixon.h>
#include "netconf_lib.h"
#include "netconf_hello.h"

View file

@ -2,20 +2,20 @@
*
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
This file is part of CLICON.
This file is part of CLIXON.
CLICON is free software; you can redistribute it and/or modify
CLIXON is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
CLICON is distributed in the hope that it will be useful,
CLIXON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with CLICON; see the file LICENSE. If not, see
along with CLIXON; see the file LICENSE. If not, see
<http://www.gnu.org/licenses/>.
*

View file

@ -2,27 +2,27 @@
*
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
This file is part of CLICON.
This file is part of CLIXON.
CLICON is free software; you can redistribute it and/or modify
CLIXON is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
CLICON is distributed in the hope that it will be useful,
CLIXON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with CLICON; see the file LICENSE. If not, see
along with CLIXON; see the file LICENSE. If not, see
<http://www.gnu.org/licenses/>.
*
* netconf lib
*****************************************************************************/
#ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */
#include "clixon_config.h" /* generated by config & autoconf */
#endif
#include <stdio.h>
@ -47,7 +47,7 @@
#include <cligen/cligen.h>
/* clicon */
#include <clicon/clicon.h>
#include <clixon/clixon.h>
#include "netconf_rpc.h"
#include "netconf_lib.h"

View file

@ -2,20 +2,20 @@
*
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
This file is part of CLICON.
This file is part of CLIXON.
CLICON is free software; you can redistribute it and/or modify
CLIXON is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
CLICON is distributed in the hope that it will be useful,
CLIXON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with CLICON; see the file LICENSE. If not, see
along with CLIXON; see the file LICENSE. If not, see
<http://www.gnu.org/licenses/>.
*

View file

@ -2,26 +2,26 @@
*
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
This file is part of CLICON.
This file is part of CLIXON.
CLICON is free software; you can redistribute it and/or modify
CLIXON is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
CLICON is distributed in the hope that it will be useful,
CLIXON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with CLICON; see the file LICENSE. If not, see
along with CLIXON; see the file LICENSE. If not, see
<http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */
#include "clixon_config.h" /* generated by config & autoconf */
#endif
#include <stdio.h>
@ -48,9 +48,9 @@
#include <cligen/cligen.h>
/* clicon */
#include <clicon/clicon.h>
#include <clixon/clixon.h>
#include "clicon_netconf.h"
#include "clixon_netconf.h"
#include "netconf_lib.h"
#include "netconf_hello.h"
#include "netconf_plugin.h"

View file

@ -2,20 +2,20 @@
*
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
This file is part of CLICON.
This file is part of CLIXON.
CLICON is free software; you can redistribute it and/or modify
CLIXON is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
CLICON is distributed in the hope that it will be useful,
CLIXON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with CLICON; see the file LICENSE. If not, see
along with CLIXON; see the file LICENSE. If not, see
<http://www.gnu.org/licenses/>.
*
@ -23,7 +23,7 @@
*/
#ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */
#include "clixon_config.h" /* generated by config & autoconf */
#endif
#include <stdio.h>
@ -46,10 +46,10 @@
#include <cligen/cligen.h>
/* clicon */
#include <clicon/clicon.h>
#include <clixon/clixon.h>
/* clicon netconf*/
#include "clicon_netconf.h"
#include "clixon_netconf.h"
#include "netconf_lib.h"
#include "netconf_plugin.h"

View file

@ -2,20 +2,20 @@
*
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
This file is part of CLICON.
This file is part of CLIXON.
CLICON is free software; you can redistribute it and/or modify
CLIXON is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
CLICON is distributed in the hope that it will be useful,
CLIXON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with CLICON; see the file LICENSE. If not, see
along with CLIXON; see the file LICENSE. If not, see
<http://www.gnu.org/licenses/>.
*

View file

@ -2,27 +2,27 @@
*
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
This file is part of CLICON.
This file is part of CLIXON.
CLICON is free software; you can redistribute it and/or modify
CLIXON is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
CLICON is distributed in the hope that it will be useful,
CLIXON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with CLICON; see the file LICENSE. If not, see
along with CLIXON; see the file LICENSE. If not, see
<http://www.gnu.org/licenses/>.
*
* Code for handling netconf rpc messages
*****************************************************************************/
#ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */
#include "clixon_config.h" /* generated by config & autoconf */
#endif
#include <stdio.h>
@ -47,9 +47,9 @@
#include <cligen/cligen.h>
/* clicon */
#include <clicon/clicon.h>
#include <clixon/clixon.h>
#include "clicon_netconf.h"
#include "clixon_netconf.h"
#include "netconf_lib.h"
#include "netconf_filter.h"
#include "netconf_plugin.h"

View file

@ -2,20 +2,20 @@
*
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
This file is part of CLICON.
This file is part of CLIXON.
CLICON is free software; you can redistribute it and/or modify
CLIXON is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
CLICON is distributed in the hope that it will be useful,
CLIXON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with CLICON; see the file LICENSE. If not, see
along with CLIXON; see the file LICENSE. If not, see
<http://www.gnu.org/licenses/>.
*