Using $(LIBDIR) instead of $(PREFIX)/lib in Makefiles

This commit is contained in:
Pierre Pronchery 2013-11-27 21:00:39 +01:00
parent f1482d1be2
commit 0ccf307ed8
4 changed files with 6 additions and 6 deletions

View File

@ -41,14 +41,14 @@ libMailer.so.0.0 libMailer.so.0 libMailer.so: $(libMailer_OBJS)
compose_OBJS = compose-main.o compose_OBJS = compose-main.o
compose_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) compose_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
compose_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(PREFIX)/lib -lMailer compose_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(LIBDIR) -lMailer
compose: $(compose_OBJS) libMailer.a compose: $(compose_OBJS) libMailer.a
$(CC) -o compose $(compose_OBJS) $(compose_LDFLAGS) $(CC) -o compose $(compose_OBJS) $(compose_LDFLAGS)
mailer_OBJS = main.o mailer_OBJS = main.o
mailer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) mailer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
mailer_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(PREFIX)/lib -lMailer mailer_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(LIBDIR) -lMailer
mailer: $(mailer_OBJS) libMailer.a mailer: $(mailer_OBJS) libMailer.a
$(CC) -o mailer $(mailer_OBJS) $(mailer_LDFLAGS) $(CC) -o mailer $(mailer_OBJS) $(mailer_LDFLAGS)

View File

@ -21,7 +21,7 @@ all: $(TARGETS)
mailing-lists_OBJS = mailing-lists.o mailing-lists_OBJS = mailing-lists.o
mailing-lists_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) mailing-lists_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
mailing-lists_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L.. -Wl,-rpath,$(PREFIX)/lib -lMailer mailing-lists_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L.. -Wl,-rpath,$(LIBDIR) -lMailer
mailing-lists.so: $(mailing-lists_OBJS) mailing-lists.so: $(mailing-lists_OBJS)
$(CCSHARED) -o mailing-lists.so $(mailing-lists_OBJS) $(mailing-lists_LDFLAGS) $(CCSHARED) -o mailing-lists.so $(mailing-lists_OBJS) $(mailing-lists_LDFLAGS)

View File

@ -8,7 +8,7 @@ dist=Makefile
[mailing-lists] [mailing-lists]
type=plugin type=plugin
sources=mailing-lists.c sources=mailing-lists.c
ldflags=-L.. -Wl,-rpath,$(PREFIX)/lib -lMailer ldflags=-L.. -Wl,-rpath,$(LIBDIR) -lMailer
install=$(LIBDIR)/Mailer/plugins install=$(LIBDIR)/Mailer/plugins
[mailing-lists.c] [mailing-lists.c]

View File

@ -19,7 +19,7 @@ type=binary
#XXX may be statically linked to libMailer (if built before libMailer.so) #XXX may be statically linked to libMailer (if built before libMailer.so)
depends=libMailer.a depends=libMailer.a
sources=compose-main.c sources=compose-main.c
ldflags=`pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(PREFIX)/lib -lMailer ldflags=`pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(LIBDIR) -lMailer
install=$(BINDIR) install=$(BINDIR)
[mailer] [mailer]
@ -27,7 +27,7 @@ type=binary
#XXX may be statically linked to libMailer (if built before libMailer.so) #XXX may be statically linked to libMailer (if built before libMailer.so)
depends=libMailer.a depends=libMailer.a
sources=main.c sources=main.c
ldflags=`pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(PREFIX)/lib -lMailer ldflags=`pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(LIBDIR) -lMailer
install=$(BINDIR) install=$(BINDIR)
[account.c] [account.c]