Simplify amalgamation script

src/basic.c

@@ -1,7 +1,10 @@
-#include "basic.h"
 #include <stddef.h>
 #include <string.h>
 
+#ifndef HTTP_AMALGAMATION
+#include "basic.h"
+#endif
+
 bool http_streq(HTTP_String s1, HTTP_String s2)
 {
 	if (s1.len != s2.len)

src/cert.c

@@ -11,7 +11,9 @@
 #include <openssl/bn.h>
 #endif
 
+#ifndef HTTP_AMALGAMATION
 #include "cert.h"
+#endif
 
 #ifdef HTTPS_ENABLED
 

src/cert.h

@@ -1,7 +1,9 @@
 #ifndef CERT_INCLUDED
 #define CERT_INCLUDED
 
+#ifndef HTTP_AMALGAMATION
 #include "basic.h"
+#endif
 
 // This is an utility to create self-signed certificates
 // useful when testing HTTPS servers locally. This is only

src/client.c

@@ -14,9 +14,11 @@
 #define POLL poll
 #endif
 
+#ifndef HTTP_AMALGAMATION
 #include "client.h"
 #include "socket.h"
 #include "engine.h"
+#endif
 
 #define CLIENT_MAX_CONNS 256
 

src/client.h

@@ -2,7 +2,10 @@
 #define CLIENT_INCLUDED
 
 #include <stdbool.h>
+
+#ifndef HTTP_AMALGAMATION
 #include "parse.h"
+#endif
 
 // Initialize the global state of cHTTP.
 //

src/engine.c

@@ -9,8 +9,10 @@
 #include <stdint.h>
 #include <string.h>
 
+#ifndef HTTP_AMALGAMATION
 #include "basic.h"
 #include "engine.h"
+#endif
 
 // This is the implementation of a byte queue useful
 // for systems that need to process engs of bytes.

src/engine.h

@@ -1,6 +1,9 @@
 #ifndef HTTP_ENGINE_INCLUDED
 #define HTTP_ENGINE_INCLUDED
+
+#ifndef HTTP_AMALGAMATION
 #include "parse.h"
+#endif
 
 typedef enum {
 	HTTP_MEMFUNC_MALLOC,

src/parse.c

@@ -2,8 +2,11 @@
 #include <stdint.h>
 #include <string.h>
 #include <assert.h>
+
+#ifndef HTTP_AMALGAMATION
 #include "parse.h"
 #include "basic.h"
+#endif
 
 // From RFC 9112
 	//   request-target = origin-form

src/parse.h

@@ -1,6 +1,9 @@
 #ifndef PARSE_INCLUDED
 #define PARSE_INCLUDED
+
+#ifndef HTTP_AMALGAMATION
 #include "basic.h"
+#endif
 
 #define HTTP_MAX_HEADERS 32
 

src/router.c

@@ -13,17 +13,20 @@
 #include <sys/stat.h>
 #endif
 
+#ifndef HTTP_AMALGAMATION
 #include "router.h"
+#endif
 
+#ifndef HTTP_AMALGAMATION
 bool is_alpha(char c)
 {
 	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
 }
-
 bool is_digit(char c)
 {
 	return c >= '0' && c <= '9';
 }
+#endif // HTTP_AMALGAMATION
 
 typedef enum {
 	ROUTE_STATIC_DIR,

src/router.h

@@ -1,7 +1,9 @@
 #ifndef HTTP_ROUTER_INCLUDED
 #define HTTP_ROUTER_INCLUDED
 
+#ifndef HTTP_AMALGAMATION
 #include "server.h"
+#endif
 
 typedef struct HTTP_Router HTTP_Router;
 typedef void (*HTTP_RouterFunc)(HTTP_Request*, HTTP_ResponseHandle, void*);;

src/server.c

@@ -1,4 +1,5 @@
 #include <stdint.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdbool.h>
 
@@ -10,14 +11,20 @@
 #endif
 
 #ifdef __linux__
+#include <fcntl.h>
+#include <unistd.h>
 #include <sys/socket.h>
+#include <arpa/inet.h>
 #include <poll.h>
+#define POLL poll
 #define CLOSE_SOCKET close
 #endif
 
+#ifndef HTTP_AMALGAMATION
 #include "engine.h"
 #include "socket.h"
 #include "server.h"
+#endif
 
 #define MAX_CONNS (1<<10)
 

src/server.h

@@ -2,7 +2,10 @@
 #define HTTP_SERVER_INCLUDED
 
 #include <stdint.h>
+
+#ifndef HTTP_AMALGAMATION
 #include "parse.h"
+#endif
 
 typedef struct {
     void *data0;

src/socket.c

@@ -1,20 +1,8 @@
-#include <poll.h>
 #include <assert.h> // TODO: organize these includes
-#include "socket.h"
-#ifdef HTTPS_ENABLED
-#include <openssl/pem.h>
-#include <openssl/conf.h>
-#include <openssl/x509v3.h>
-#include <openssl/rsa.h>
-#include <openssl/evp.h>
-#include <openssl/bn.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -24,9 +12,23 @@
 #endif
 
 #ifdef __linux__
+#include <poll.h>
 #include <netdb.h>
 #endif
 
+#ifdef HTTPS_ENABLED
+#include <openssl/pem.h>
+#include <openssl/conf.h>
+#include <openssl/x509v3.h>
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
+#include <openssl/bn.h>
+#endif
+
+#ifndef HTTP_AMALGAMATION
+#include "socket.h"
+#endif
+
 void socket_global_init(void)
 {
 #ifdef HTTPS_ENABLED

src/socket.h

@@ -61,7 +61,9 @@
 #include <openssl/x509v3.h>
 #endif
 
+#ifndef HTTP_AMALGAMATION
 #include "parse.h"
+#endif
 
 typedef struct {
     int is_ipv6;