From 7e5888c31a2a460c69dba8389ecce232545dac50 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Thu, 25 Jul 2013 23:54:16 +0200 Subject: [PATCH] Build with "-lintl" by default --- src/Makefile | 8 ++++---- src/project.conf | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Makefile b/src/Makefile index 98fde70..82584db 100644 --- a/src/Makefile +++ b/src/Makefile @@ -21,22 +21,22 @@ subdirs: @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done panel_OBJS = panel.o window.o main.o -panel_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D PREFIX=\"$(PREFIX)\" $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem libDesktop` -panel_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem libDesktop` +panel_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D PREFIX=\"$(PREFIX)\" $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libDesktop` +panel_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop` -lintl panel: $(panel_OBJS) $(CC) -o panel $(panel_OBJS) $(panel_LDFLAGS) panelctl_OBJS = panelctl.o panelctl_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libDesktop` -panelctl_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop` +panelctl_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop` -lintl panelctl: $(panelctl_OBJS) $(CC) -o panelctl $(panelctl_OBJS) $(panelctl_LDFLAGS) run_OBJS = run.o run_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D PREFIX=\"$(PREFIX)\" $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-2.0` -run_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-2.0` +run_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-2.0` -lintl run: $(run_OBJS) $(CC) -o run $(run_OBJS) $(run_LDFLAGS) diff --git a/src/project.conf b/src/project.conf index 79027ff..0e4fc3b 100644 --- a/src/project.conf +++ b/src/project.conf @@ -9,8 +9,8 @@ dist=Makefile,helper.c,panel.h,window.h type=binary sources=panel.c,window.c,main.c cppflags=-D PREFIX=\"$(PREFIX)\" -cflags=`pkg-config --cflags libSystem libDesktop` -ldflags=`pkg-config --libs libSystem libDesktop` +cflags=`pkg-config --cflags libDesktop` +ldflags=`pkg-config --libs libDesktop` -lintl install=$(BINDIR) [main.c] @@ -26,7 +26,7 @@ depends=panel.h,window.h type=binary sources=panelctl.c cflags=`pkg-config --cflags libDesktop` -ldflags=`pkg-config --libs libDesktop` +ldflags=`pkg-config --libs libDesktop` -lintl install=$(BINDIR) [panelctl.c] @@ -37,5 +37,5 @@ type=binary sources=run.c cppflags=-D PREFIX=\"$(PREFIX)\" cflags=`pkg-config --cflags libSystem gtk+-2.0` -ldflags=`pkg-config --libs libSystem gtk+-2.0` +ldflags=`pkg-config --libs libSystem gtk+-2.0` -lintl install=$(BINDIR)