diff --git a/CHANGELOG.md b/CHANGELOG.md index dab8f27e..ecf9e225 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ features include optimized search functions and a repair callback. [search](https://clixon-docs.readthedocs.io/en/latest/xml.html#searching-in-xml) ### API changes on existing protocol/config features (You may have have to change how you use Clixon) +* In the bbuild system, you dont need to do `make install-include` for installing include files for compiling. This is now included in the actions done by `make install`. * State data is now ordered-by system for performance reasons. For example, alphabetically for strings and numeric for integers * Controlled by compile-time option `STATE_ORDERED_BY_SYSTEM` * Obsolete configuration options present in clixon configuration file will cause clixon application to exit at startup. diff --git a/doc/FAQ.md b/doc/FAQ.md index ae97a24a..34c48651 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -80,7 +80,6 @@ Clixon: ./configure --enable-optyang; make; sudo make install; - sudo make install-include ``` (note: optyang enable only if you need to run the main example, otherwise it is not necessary). diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index bca035c0..47ea47d3 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -65,7 +65,6 @@ RUN apk add --update nginx RUN ./configure --prefix=/clixon/build --with-cligen=/clixon/build --with-wwwuser=www-data RUN make RUN make install -RUN make install-include # Build and install the clixon hello example (not really necessary for base) WORKDIR /clixon/clixon/example/hello diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile index 2616e9cd..fe828339 100644 --- a/docker/main/Dockerfile +++ b/docker/main/Dockerfile @@ -1,7 +1,8 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2017-2020 Olof Hagsand +# Copyright (C) 2017-2019 Olof Hagsand +# Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC # # This file is part of CLIXON # @@ -65,7 +66,6 @@ RUN apk add --update nginx RUN ./configure --prefix=/clixon/build --with-cligen=/clixon/build --with-wwwuser=www-data --enable-optyangs RUN make RUN make install -RUN make install-include # Install utils WORKDIR /clixon/clixon/util diff --git a/docker/main/Makefile.in b/docker/main/Makefile.in index b14b23d3..b59ebcc8 100644 --- a/docker/main/Makefile.in +++ b/docker/main/Makefile.in @@ -1,7 +1,8 @@ # # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2017-2020 Olof Hagsand +# Copyright (C) 2017-2019 Olof Hagsand +# Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC # # This file is part of CLIXON # diff --git a/docker/main/start.sh b/docker/main/start.sh index 365154b7..1a89d11e 100755 --- a/docker/main/start.sh +++ b/docker/main/start.sh @@ -1,7 +1,8 @@ #!/bin/bash # ***** BEGIN LICENSE BLOCK ***** # -# Copyright (C) 2017-2020 Olof Hagsand +# Copyright (C) 2017-2019 Olof Hagsand +# Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC # # This file is part of CLIXON # diff --git a/etc/README b/etc/README index 088f412f..581448d1 100644 --- a/etc/README +++ b/etc/README @@ -7,7 +7,6 @@ Example: > ./configure --prefix=/hello > make > make install -> make install-include > cd > source /hello/etc/cliconrc > clicon_config diff --git a/test/cicd/clixon-mk.sh b/test/cicd/clixon-mk.sh index 20cbe7d2..4445e242 100644 --- a/test/cicd/clixon-mk.sh +++ b/test/cicd/clixon-mk.sh @@ -9,7 +9,6 @@ fi $MAKE clean $MAKE -j10 sudo $MAKE install -sudo $MAKE install-include (cd example; $MAKE) (cd util; $MAKE) (cd example; sudo $MAKE install)