From 593e61dbd50c1c26a3ad3a60dfd856c500f825ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Sun, 12 Aug 2007 11:54:28 +0000 Subject: [PATCH] Improve build system slightly - Dont use any ugly "../.." -include or -lib paths - Link using --rpath to avoid having to set LD_LIBRARY_PATH - Declare static / dynamic linking flags in top level configure --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index eedba790..07eb7e9e 100644 --- a/Makefile +++ b/Makefile @@ -12,11 +12,11 @@ SRCS += output_client.c output_multicast.c PROG = tvhead CFLAGS += -g -Wall -Werror -O2 -CFLAGS += -I$(CURDIR)/../install/include +CFLAGS += -I$(INCLUDES_INSTALL_BASE) CFLAGS += -Wno-deprecated-declarations CFLAGS += -D_LARGEFILE64_SOURCE CFLAGS += -DENABLE_INPUT_IPTV -DENABLE_INPUT_DVB -LDFLAGS += -L$(CURDIR)/../install/lib +LDFLAGS += -L$(LIBS_INSTALL_BASE) DLIBS += -lhts @@ -56,7 +56,7 @@ install: ${PROG}: $(.OBJDIR) $(OBJS) Makefile cd $(.OBJDIR) && $(CC) $(LDFLAGS) -o $@ $(OBJS) \ - -Wl,-Bstatic $(SLIBS) -Wl,-Bdynamic $(DLIBS) + $(STATIC_LINKFLAGS) $(SLIBS) $(DYNAMIC_LINKFLAGS) $(DLIBS) $(.OBJDIR): mkdir $(.OBJDIR)