Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#

CFLAGS := -Wall -Wextra -Wshadow -ansi -fshort-enums -fpic
CFLAGS := -Wall -Wextra -Wshadow -fshort-enums -fpic

all: build tests example

Expand All @@ -26,28 +26,28 @@ libs_dir:
mkdir -p libs

libs/libproxyprotocol.so: src/proxy_protocol.o
$(CC) -shared -o $@ $+
$(CC) -shared -o $@ src/proxy_protocol.o

src/proxy_protocol.o: src/proxy_protocol.c src/proxy_protocol.h
$(CC) ${CFLAGS} -pedantic -c -o $@ $<

src/.o: %.c src/proxy_protocol.h
$(CC) ${CFLAGS} -c -o $@ $<
$(CC) ${CFLAGS} -c -o $@ src/proxy_protocol.c

tests: tests/test_libproxyprotocol
LD_LIBRARY_PATH=libs/ $<
LD_LIBRARY_PATH=libs/ tests/test_libproxyprotocol

tests/test_libproxyprotocol: tests/test.o libs/libproxyprotocol.so
$(CC) -Llibs/ ${CFLAGS} -o $@ $< -lproxyprotocol
$(CC) -Llibs/ ${CFLAGS} -o $@ tests/test.o -lproxyprotocol

tests/test.o: tests/test.c src/proxy_protocol.h
$(CC) ${CFLAGS} -c -o $@ tests/test.c

example: examples/client_server
LD_LIBRARY_PATH=libs/ $<
LD_LIBRARY_PATH=libs/ examples/client_server

examples/client_server: examples/client_server.o libs/libproxyprotocol.so
$(CC) -Llibs/ ${CFLAGS} -o $@ $< -lproxyprotocol
$(CC) -Llibs/ ${CFLAGS} -o $@ examples/client_server.o -lproxyprotocol

examples/client_server.o: examples/client_server.c
$(CC) ${CFLAGS} -pedantic -c -o $@ $<
examples/client_server.o: examples/client_server.c src/proxy_protocol.h
$(CC) ${CFLAGS} -c -o $@ examples/client_server.c

clean:
$(RM) src/*.o libs/libproxyprotocol.so
Expand Down
3 changes: 3 additions & 0 deletions examples/client_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
#include <ws2tcpip.h>
#pragma comment(lib, "ws2_32.lib")
#else
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#endif

Expand Down
3 changes: 3 additions & 0 deletions src/proxy_protocol.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
/* Caution: To be used only with fixed length arrays */
#define _sprintf(buffer, format, ...) sprintf_s(buffer, sizeof(buffer), format, __VA_ARGS__)
#else
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdarg.h>
/* vsprintf() and vargs as snprintf and __VA_ARGS__ do not exist in ANSI C */
Expand Down
3 changes: 3 additions & 0 deletions tests/test.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
#include <ws2tcpip.h>
#pragma comment(lib, "ws2_32.lib")
#else
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#endif

Expand Down
Loading