Changeset d203495

Timestamp:

2014-07-19T23:55:24Z (10 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

778ea8a

Parents:

5f818ae

Message:

Allow LDFLAGS to be provided in the environment and consistently use $(LDFLAGS)
when linking (not partially linking).

Files:

• Makefile (modified) (3 diffs)
• configure (modified) (1 diff)
• debian/rules (modified) (1 diff)

Makefile

@@ -16 +16 @@
 ifeq ($(TARGET),i586-mingw32msvc)
 objects += win32.o
-LFLAGS+=-lws2_32
+LDFLAGS+=-lws2_32
 EFLAGS+=-lsecur32
 OUTFILE=bitlbee.exe
@@ -174 +174 @@
 $(SKYPE_PI): $(_SRCDIR_)protocols/skype/skype.c
         @echo '*' Building plugin skype
-        @$(CC) $(CFLAGS) $(SKYPEFLAGS) $< -o $@
+        @$(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
 
 $(objects): %.o: $(_SRCDIR_)%.c
@@ -184 +184 @@
 $(OUTFILE): $(objects) $(subdirs)
         @echo '*' Linking $(OUTFILE)
-        @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LFLAGS) $(EFLAGS)
+        @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
 ifndef DEBUG
         @echo '*' Stripping $(OUTFILE)

configure

@@ -213 +213 @@
 fi
 
+echo LDFLAGS=$LDFLAGS >> Makefile.settings
+
 echo CFLAGS=$CFLAGS $CPPFLAGS >> Makefile.settings
 echo CFLAGS+=-I${srcdir} -I${srcdir}/lib -I${srcdir}/protocols -I. >> Makefile.settings

debian/rules

@@ -44 +44 @@
 ifeq ($(BITLBEE_LIBPURPLE),1)
         mkdir -p debian/build-libpurple
-        ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --purple=1 $(BITLBEE_CONFIGURE_FLAGS)
+        ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $(shell dpkg-buildflags --export=configure) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --purple=1 $(BITLBEE_CONFIGURE_FLAGS)
         $(MAKE) -C debian/build-libpurple
 endif