aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am229
1 files changed, 63 insertions, 166 deletions
diff --git a/Makefile.am b/Makefile.am
index 040f291..1c5837b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,9 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
--disable-valgrind \
$(NULL)
+if INTERNAL_SQUAREBALL
+SUBDIRS = squareball
+endif
## File listings
@@ -65,19 +68,10 @@ noinst_HEADERS = \
src/blogc-runserver/httpd.h \
src/blogc-runserver/httpd-utils.h \
src/blogc-runserver/mime.h \
- src/common/compat.h \
- src/common/config-parser.h \
- src/common/error.h \
- src/common/file.h \
- src/common/sort.h \
- src/common/stdin.h \
- src/common/utf8.h \
- src/common/utils.h \
$(NULL)
noinst_LTLIBRARIES = \
libblogc.la \
- libblogc_common.la \
$(NULL)
noinst_PROGRAMS = \
@@ -139,27 +133,12 @@ libblogc_la_SOURCES = \
libblogc_la_CFLAGS = \
$(AM_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
libblogc_la_LIBADD = \
$(LIBM) \
- libblogc_common.la \
- $(NULL)
-
-
-libblogc_common_la_SOURCES = \
- src/common/compat.c \
- src/common/config-parser.c \
- src/common/error.c \
- src/common/file.c \
- src/common/sort.c \
- src/common/stdin.c \
- src/common/utf8.c \
- src/common/utils.c \
- $(NULL)
-
-libblogc_common_la_CFLAGS = \
- $(AM_CFLAGS) \
+ $(SQUAREBALL_LIBS) \
$(NULL)
@@ -169,11 +148,12 @@ blogc_SOURCES = \
blogc_CFLAGS = \
$(AM_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
blogc_LDADD = \
+ $(SQUAREBALL_LIBS) \
libblogc.la \
- libblogc_common.la \
$(NULL)
if BUILD_MAKE_EMBEDDED
@@ -194,11 +174,12 @@ blogc_git_receiver_SOURCES = \
blogc_git_receiver_CFLAGS = \
$(AM_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
blogc_git_receiver_LDADD = \
+ $(SQUAREBALL_LIBS) \
libblogc_git_receiver.la \
- libblogc_common.la \
$(NULL)
libblogc_git_receiver_la_SOURCES = \
@@ -212,10 +193,11 @@ libblogc_git_receiver_la_SOURCES = \
libblogc_git_receiver_la_CFLAGS = \
$(AM_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
libblogc_git_receiver_la_LIBADD = \
- libblogc_common.la \
+ $(SQUAREBALL_LIBS) \
$(NULL)
endif
@@ -227,13 +209,14 @@ blogc_make_SOURCES = \
blogc_make_CFLAGS = \
$(AM_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(PTHREAD_CFLAGS) \
$(NULL)
blogc_make_LDADD = \
+ $(SQUAREBALL_LIBS) \
$(PTHREAD_LIBS) \
libblogc_make.la \
- libblogc_common.la \
$(NULL)
endif
@@ -252,12 +235,13 @@ libblogc_make_la_SOURCES = \
libblogc_make_la_CFLAGS = \
$(AM_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(PTHREAD_CFLAGS) \
$(NULL)
libblogc_make_la_LIBADD = \
+ $(SQUAREBALL_LIBS) \
$(PTHREAD_LIBS) \
- libblogc_common.la \
$(NULL)
endif
@@ -269,13 +253,14 @@ blogc_runserver_SOURCES = \
blogc_runserver_CFLAGS = \
$(AM_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(PTHREAD_CFLAGS) \
$(NULL)
blogc_runserver_LDADD = \
+ $(SQUAREBALL_LIBS) \
$(PTHREAD_LIBS) \
libblogc_runserver.la \
- libblogc_common.la \
$(NULL)
libblogc_runserver_la_SOURCES = \
@@ -286,12 +271,13 @@ libblogc_runserver_la_SOURCES = \
libblogc_runserver_la_CFLAGS = \
$(AM_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(PTHREAD_CFLAGS) \
$(NULL)
libblogc_runserver_la_LIBADD = \
+ $(SQUAREBALL_LIBS) \
$(PTHREAD_LIBS) \
- libblogc_common.la \
$(NULL)
endif
@@ -471,11 +457,6 @@ check_PROGRAMS += \
tests/blogc/check_renderer \
tests/blogc/check_source_parser \
tests/blogc/check_template_parser \
- tests/common/check_config_parser \
- tests/common/check_error \
- tests/common/check_sort \
- tests/common/check_utf8 \
- tests/common/check_utils \
$(NULL)
if USE_LD_WRAP
@@ -484,7 +465,6 @@ check_PROGRAMS += \
tests/blogc/check_loader \
tests/blogc/check_sysinfo \
tests/blogc/check_sysinfo2 \
- tests/common/check_stdin \
$(NULL)
tests_blogc_check_funcvars_SOURCES = \
@@ -493,17 +473,18 @@ tests_blogc_check_funcvars_SOURCES = \
tests_blogc_check_funcvars_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_check_funcvars_LDFLAGS = \
-no-install \
- -Wl,--wrap=bc_file_get_contents \
+ -Wl,--wrap=sb_file_get_contents \
$(NULL)
tests_blogc_check_funcvars_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc.la \
- libblogc_common.la \
$(NULL)
tests_blogc_check_loader_SOURCES = \
@@ -512,17 +493,18 @@ tests_blogc_check_loader_SOURCES = \
tests_blogc_check_loader_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_check_loader_LDFLAGS = \
-no-install \
- -Wl,--wrap=bc_file_get_contents \
+ -Wl,--wrap=sb_file_get_contents_utf8 \
$(NULL)
tests_blogc_check_loader_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc.la \
- libblogc_common.la \
$(NULL)
tests_blogc_check_sysinfo_SOURCES = \
@@ -531,11 +513,12 @@ tests_blogc_check_sysinfo_SOURCES = \
tests_blogc_check_sysinfo_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_check_sysinfo_LDFLAGS = \
-no-install \
- -Wl,--wrap=bc_file_get_contents \
+ -Wl,--wrap=sb_file_get_contents \
-Wl,--wrap=getenv \
$(NULL)
@@ -554,8 +537,8 @@ endif
tests_blogc_check_sysinfo_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc.la \
- libblogc_common.la \
$(NULL)
tests_blogc_check_sysinfo2_SOURCES = \
@@ -564,35 +547,18 @@ tests_blogc_check_sysinfo2_SOURCES = \
tests_blogc_check_sysinfo2_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_check_sysinfo2_LDFLAGS = \
-no-install \
- -Wl,--wrap=bc_file_get_contents \
+ -Wl,--wrap=sb_file_get_contents \
$(NULL)
tests_blogc_check_sysinfo2_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc.la \
- libblogc_common.la \
- $(NULL)
-
-tests_common_check_stdin_SOURCES = \
- tests/common/check_stdin.c \
- $(NULL)
-
-tests_common_check_stdin_CFLAGS = \
- $(CMOCKA_CFLAGS) \
- $(NULL)
-
-tests_common_check_stdin_LDFLAGS = \
- -no-install \
- -Wl,--wrap=fgetc \
- $(NULL)
-
-tests_common_check_stdin_LDADD = \
- $(CMOCKA_LIBS) \
- libblogc_common.la \
$(NULL)
if HAVE_SYS_RESOURCE_H
@@ -607,6 +573,7 @@ tests_blogc_check_rusage_SOURCES = \
tests_blogc_check_rusage_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_check_rusage_LDFLAGS = \
@@ -616,8 +583,8 @@ tests_blogc_check_rusage_LDFLAGS = \
tests_blogc_check_rusage_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc.la \
- libblogc_common.la \
$(NULL)
endif
endif
@@ -630,6 +597,7 @@ tests_blogc_check_content_parser_SOURCES = \
tests_blogc_check_content_parser_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_check_content_parser_LDFLAGS = \
@@ -638,8 +606,8 @@ tests_blogc_check_content_parser_LDFLAGS = \
tests_blogc_check_content_parser_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc.la \
- libblogc_common.la \
$(NULL)
tests_blogc_check_datetime_parser_SOURCES = \
@@ -648,6 +616,7 @@ tests_blogc_check_datetime_parser_SOURCES = \
tests_blogc_check_datetime_parser_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_check_datetime_parser_LDFLAGS = \
@@ -656,8 +625,8 @@ tests_blogc_check_datetime_parser_LDFLAGS = \
tests_blogc_check_datetime_parser_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc.la \
- libblogc_common.la \
$(NULL)
tests_blogc_check_renderer_SOURCES = \
@@ -666,6 +635,7 @@ tests_blogc_check_renderer_SOURCES = \
tests_blogc_check_renderer_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_check_renderer_LDFLAGS = \
@@ -674,8 +644,8 @@ tests_blogc_check_renderer_LDFLAGS = \
tests_blogc_check_renderer_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc.la \
- libblogc_common.la \
$(NULL)
tests_blogc_check_source_parser_SOURCES = \
@@ -684,6 +654,7 @@ tests_blogc_check_source_parser_SOURCES = \
tests_blogc_check_source_parser_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_check_source_parser_LDFLAGS = \
@@ -692,8 +663,8 @@ tests_blogc_check_source_parser_LDFLAGS = \
tests_blogc_check_source_parser_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc.la \
- libblogc_common.la \
$(NULL)
tests_blogc_check_template_parser_SOURCES = \
@@ -702,6 +673,7 @@ tests_blogc_check_template_parser_SOURCES = \
tests_blogc_check_template_parser_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_check_template_parser_LDFLAGS = \
@@ -710,93 +682,8 @@ tests_blogc_check_template_parser_LDFLAGS = \
tests_blogc_check_template_parser_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc.la \
- libblogc_common.la \
- $(NULL)
-
-tests_common_check_config_parser_SOURCES = \
- tests/common/check_config_parser.c \
- $(NULL)
-
-tests_common_check_config_parser_CFLAGS = \
- $(CMOCKA_CFLAGS) \
- $(NULL)
-
-tests_common_check_config_parser_LDFLAGS = \
- -no-install \
- $(NULL)
-
-tests_common_check_config_parser_LDADD = \
- $(CMOCKA_LIBS) \
- libblogc_common.la \
- $(NULL)
-
-tests_common_check_error_SOURCES = \
- tests/common/check_error.c \
- $(NULL)
-
-tests_common_check_error_CFLAGS = \
- $(CMOCKA_CFLAGS) \
- $(NULL)
-
-tests_common_check_error_LDFLAGS = \
- -no-install \
- $(NULL)
-
-tests_common_check_error_LDADD = \
- $(CMOCKA_LIBS) \
- libblogc_common.la \
- $(NULL)
-
-tests_common_check_sort_SOURCES = \
- tests/common/check_sort.c \
- $(NULL)
-
-tests_common_check_sort_CFLAGS = \
- $(CMOCKA_CFLAGS) \
- $(NULL)
-
-tests_common_check_sort_LDFLAGS = \
- -no-install \
- $(NULL)
-
-tests_common_check_sort_LDADD = \
- $(CMOCKA_LIBS) \
- libblogc_common.la \
- $(NULL)
-
-tests_common_check_utf8_SOURCES = \
- tests/common/check_utf8.c \
- $(NULL)
-
-tests_common_check_utf8_CFLAGS = \
- $(CMOCKA_CFLAGS) \
- $(NULL)
-
-tests_common_check_utf8_LDFLAGS = \
- -no-install \
- $(NULL)
-
-tests_common_check_utf8_LDADD = \
- $(CMOCKA_LIBS) \
- libblogc_common.la \
- $(NULL)
-
-tests_common_check_utils_SOURCES = \
- tests/common/check_utils.c \
- $(NULL)
-
-tests_common_check_utils_CFLAGS = \
- $(CMOCKA_CFLAGS) \
- $(NULL)
-
-tests_common_check_utils_LDFLAGS = \
- -no-install \
- $(NULL)
-
-tests_common_check_utils_LDADD = \
- $(CMOCKA_LIBS) \
- libblogc_common.la \
$(NULL)
if BUILD_RUNSERVER
@@ -812,6 +699,7 @@ tests_blogc_runserver_check_httpd_utils_SOURCES = \
tests_blogc_runserver_check_httpd_utils_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_runserver_check_httpd_utils_LDFLAGS = \
@@ -821,8 +709,8 @@ tests_blogc_runserver_check_httpd_utils_LDFLAGS = \
tests_blogc_runserver_check_httpd_utils_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc_runserver.la \
- libblogc_common.la \
$(NULL)
tests_blogc_runserver_check_mime_SOURCES = \
@@ -831,6 +719,7 @@ tests_blogc_runserver_check_mime_SOURCES = \
tests_blogc_runserver_check_mime_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_runserver_check_mime_LDFLAGS = \
@@ -840,8 +729,8 @@ tests_blogc_runserver_check_mime_LDFLAGS = \
tests_blogc_runserver_check_mime_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc_runserver.la \
- libblogc_common.la \
$(NULL)
endif
endif
@@ -863,6 +752,7 @@ tests_blogc_git_receiver_check_settings_SOURCES = \
tests_blogc_git_receiver_check_settings_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_git_receiver_check_settings_LDFLAGS = \
@@ -872,8 +762,8 @@ tests_blogc_git_receiver_check_settings_LDFLAGS = \
tests_blogc_git_receiver_check_settings_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc_git_receiver.la \
- libblogc_common.la \
$(NULL)
endif
@@ -883,6 +773,7 @@ tests_blogc_git_receiver_check_pre_receive_parser_SOURCES = \
tests_blogc_git_receiver_check_pre_receive_parser_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_git_receiver_check_pre_receive_parser_LDFLAGS = \
@@ -891,8 +782,8 @@ tests_blogc_git_receiver_check_pre_receive_parser_LDFLAGS = \
tests_blogc_git_receiver_check_pre_receive_parser_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc_git_receiver.la \
- libblogc_common.la \
$(NULL)
tests_blogc_git_receiver_check_shell_command_parser_SOURCES = \
@@ -901,6 +792,7 @@ tests_blogc_git_receiver_check_shell_command_parser_SOURCES = \
tests_blogc_git_receiver_check_shell_command_parser_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_git_receiver_check_shell_command_parser_LDFLAGS = \
@@ -909,8 +801,8 @@ tests_blogc_git_receiver_check_shell_command_parser_LDFLAGS = \
tests_blogc_git_receiver_check_shell_command_parser_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc_git_receiver.la \
- libblogc_common.la \
$(NULL)
endif
@@ -933,6 +825,7 @@ tests_blogc_make_check_exec_SOURCES = \
tests_blogc_make_check_exec_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_make_check_exec_LDFLAGS = \
@@ -942,8 +835,8 @@ tests_blogc_make_check_exec_LDFLAGS = \
tests_blogc_make_check_exec_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc_make.la \
- libblogc_common.la \
$(NULL)
endif
@@ -953,6 +846,7 @@ tests_blogc_make_check_atom_SOURCES = \
tests_blogc_make_check_atom_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_make_check_atom_LDFLAGS = \
@@ -961,8 +855,8 @@ tests_blogc_make_check_atom_LDFLAGS = \
tests_blogc_make_check_atom_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc_make.la \
- libblogc_common.la \
$(NULL)
tests_blogc_make_check_rules_SOURCES = \
@@ -971,6 +865,7 @@ tests_blogc_make_check_rules_SOURCES = \
tests_blogc_make_check_rules_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_make_check_rules_LDFLAGS = \
@@ -979,8 +874,8 @@ tests_blogc_make_check_rules_LDFLAGS = \
tests_blogc_make_check_rules_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc_make.la \
- libblogc_common.la \
$(NULL)
tests_blogc_make_check_settings_SOURCES = \
@@ -989,6 +884,7 @@ tests_blogc_make_check_settings_SOURCES = \
tests_blogc_make_check_settings_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_make_check_settings_LDFLAGS = \
@@ -997,8 +893,8 @@ tests_blogc_make_check_settings_LDFLAGS = \
tests_blogc_make_check_settings_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc_make.la \
- libblogc_common.la \
$(NULL)
tests_blogc_make_check_utils_SOURCES = \
@@ -1007,6 +903,7 @@ tests_blogc_make_check_utils_SOURCES = \
tests_blogc_make_check_utils_CFLAGS = \
$(CMOCKA_CFLAGS) \
+ $(SQUAREBALL_CFLAGS) \
$(NULL)
tests_blogc_make_check_utils_LDFLAGS = \
@@ -1015,8 +912,8 @@ tests_blogc_make_check_utils_LDFLAGS = \
tests_blogc_make_check_utils_LDADD = \
$(CMOCKA_LIBS) \
+ $(SQUAREBALL_LIBS) \
libblogc_make.la \
- libblogc_common.la \
$(NULL)
endif