Skip to content

Commit

Permalink
project restructuring in order to make install also header files.
Browse files Browse the repository at this point in the history
Too bad I cannot easily install_my_HEADERS, while preserving
directory structure per file but stripping off the src/, too bad.
  • Loading branch information
christianparpart committed Feb 12, 2017
1 parent d896a07 commit 4333e3d
Show file tree
Hide file tree
Showing 626 changed files with 777 additions and 578 deletions.
1,104 changes: 549 additions & 555 deletions Makefile.am

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions XzeroBase.pc.in
@@ -0,0 +1,12 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: XzeroBase
Description: libXzeroBase library and headers
Version: @PACKAGE_VERSION@
# Requires:
# Conflicts:
Libs: -L${libdir} -lXzeroBase @BASE_LIBS@
Cflags: -I${includedir} @BASE_CXXFLAGS@
12 changes: 12 additions & 0 deletions XzeroFlow.pc.in
@@ -0,0 +1,12 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: XzeroFlow
Description: libXzeroFlow library and headers
Version: @PACKAGE_VERSION@
Requires: XzeroBase
# Conflicts:
Libs: -L${libdir} -lXzeroFlow
Cflags: -I${includedir}
4 changes: 2 additions & 2 deletions autogen.sh
Expand Up @@ -11,8 +11,8 @@ FILES=(
/install-sh
/missing
/depcomp
/src/xzero/sysconfig.h.in
/src/xzero-flow/sysconfig.h.in
/xzero/sysconfig.h.in
/xzero-flow/sysconfig.h.in
)

if test "$1" == "clean"; then
Expand Down
14 changes: 12 additions & 2 deletions configure.ac
Expand Up @@ -182,6 +182,16 @@ AC_SUBST([PLATFORM_LDFLAGS])

####### OUTPUT ################################################################

AC_CONFIG_HEADERS(src/xzero/sysconfig.h)
AC_CONFIG_FILES(Makefile)
BASE_CXXFLAGS="-DXOPEN_SOURCE=600 -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE \
-D_LARGEFILE_SOURCE -D_LARGE_FILES -Wall -Wextra -std=c++14 \
-Wno-unused-variable -Wno-unused-parameter \
$PLATFORM_CXXFLAGS $LIBPCRE_CFLAGS $OPENSSL_CFLAGS"
AC_SUBST([BASE_CXXFLAGS])

BASE_LIBS="$PLATFORM_LDFLAGS $OPENSSL_LDADD $LIBPCRE_LIBS $OPENSSL_LIBS \
$ZLIB_LIBS $BZLIB_LIBS"
AC_SUBST([BASE_LIBS])

AC_CONFIG_HEADERS(xzero/sysconfig.h)
AC_CONFIG_FILES(Makefile XzeroBase.pc XzeroFlow.pc)
AC_OUTPUT
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/x0d/modules/access.cc → src/modules/access.cc
Expand Up @@ -5,7 +5,7 @@
// file except in compliance with the License. You may obtain a copy of
// the License at: http://opensource.org/licenses/MIT

#include <x0d/modules/access.h>
#include "access.h"
#include <xzero/http/HttpRequest.h>
#include <xzero/http/HttpResponse.h>
#include <xzero/net/IPAddress.h>
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/x0d/modules/accesslog.cc → src/modules/accesslog.cc
Expand Up @@ -17,7 +17,7 @@
* void accesslog(string file, string format = "main");
*/

#include <x0d/modules/accesslog.h>
#include "accesslog.h"

#include <xzero/http/HttpRequest.h>
#include <xzero/http/HttpResponse.h>
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/x0d/modules/auth.cc → src/modules/auth.cc
Expand Up @@ -21,7 +21,7 @@
* handler auth.require();
*/

#include <x0d/modules/auth.h>
#include "auth.h"
#include <xzero/http/HttpRequest.h>
#include <xzero/http/HttpResponse.h>
#include <xzero/base64.h>
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/x0d/modules/compress.cc → src/modules/compress.cc
Expand Up @@ -5,7 +5,7 @@
// file except in compliance with the License. You may obtain a copy of
// the License at: http://opensource.org/licenses/MIT

#include <x0d/modules/compress.h>
#include "compress.h"
#include <x0d/XzeroModule.h>
#include <x0d/XzeroContext.h>

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/x0d/modules/core.cc → src/modules/core.cc
Expand Up @@ -5,9 +5,9 @@
// file except in compliance with the License. You may obtain a copy of
// the License at: http://opensource.org/licenses/MIT

#include "core.h"
#include <x0d/XzeroModule.h>
#include <x0d/XzeroContext.h>
#include <x0d/modules/core.h>
#include <xzero/http/HttpRequest.h>
#include <xzero/http/HttpResponse.h>
#include <xzero/io/FileUtil.h>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -5,7 +5,7 @@
// file except in compliance with the License. You may obtain a copy of
// the License at: http://opensource.org/licenses/MIT

#include <x0d/modules/dirlisting.h>
#include "dirlisting.h"
#include <xzero/http/HttpRequest.h>
#include <xzero/http/HttpResponse.h>
#include <xzero/io/FileUtil.h>
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/x0d/modules/empty_gif.cc → src/modules/empty_gif.cc
Expand Up @@ -5,7 +5,7 @@
// file except in compliance with the License. You may obtain a copy of
// the License at: http://opensource.org/licenses/MIT

#include <x0d/modules/empty_gif.h>
#include "empty_gif.h"
#include <x0d/XzeroContext.h>
#include <xzero/http/HttpRequest.h>
#include <xzero/http/HttpResponse.h>
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/x0d/modules/proxy.cc → src/modules/proxy.cc
Expand Up @@ -11,7 +11,7 @@
* - does not forward Expect request header to upstream
*/

#include <x0d/modules/proxy.h>
#include "proxy.h"
#include <x0d/XzeroContext.h>
#include <xzero/sysconfig.h>
#include <xzero/http/client/HttpCluster.h>
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/x0d/modules/userdir.cc → src/modules/userdir.cc
Expand Up @@ -5,7 +5,7 @@
// file except in compliance with the License. You may obtain a copy of
// the License at: http://opensource.org/licenses/MIT

#include <x0d/modules/userdir.h>
#include "userdir.h"
#include <x0d/XzeroContext.h>
#include <xzero/http/HttpRequest.h>
#include <xzero/http/HttpResponse.h>
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/x0d/modules/webdav.cc → src/modules/webdav.cc
Expand Up @@ -5,7 +5,7 @@
// file except in compliance with the License. You may obtain a copy of
// the License at: http://opensource.org/licenses/MIT

#include <x0d/modules/webdav.h>
#include "webdav.h"
#include <xzero/http/HttpRequest.h>
#include <xzero/http/HttpResponse.h>
#include <xzero/io/OutputStream.h>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 0 additions & 9 deletions x0d.pc.in

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 4333e3d

Please sign in to comment.