Changeset d203495


Ignore:
Timestamp:
2014-07-19T23:55:24Z (5 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:
3 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r5f818ae rd203495  
    1616ifeq ($(TARGET),i586-mingw32msvc)
    1717objects += win32.o
    18 LFLAGS+=-lws2_32
     18LDFLAGS+=-lws2_32
    1919EFLAGS+=-lsecur32
    2020OUTFILE=bitlbee.exe
     
    174174$(SKYPE_PI): $(_SRCDIR_)protocols/skype/skype.c
    175175        @echo '*' Building plugin skype
    176         @$(CC) $(CFLAGS) $(SKYPEFLAGS) $< -o $@
     176        @$(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
    177177
    178178$(objects): %.o: $(_SRCDIR_)%.c
     
    184184$(OUTFILE): $(objects) $(subdirs)
    185185        @echo '*' Linking $(OUTFILE)
    186         @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LFLAGS) $(EFLAGS)
     186        @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
    187187ifndef DEBUG
    188188        @echo '*' Stripping $(OUTFILE)
  • configure

    r5f818ae rd203495  
    213213fi
    214214
     215echo LDFLAGS=$LDFLAGS >> Makefile.settings
     216
    215217echo CFLAGS=$CFLAGS $CPPFLAGS >> Makefile.settings
    216218echo CFLAGS+=-I${srcdir} -I${srcdir}/lib -I${srcdir}/protocols -I. >> Makefile.settings
  • debian/rules

    r5f818ae rd203495  
    4444ifeq ($(BITLBEE_LIBPURPLE),1)
    4545        mkdir -p debian/build-libpurple
    46         ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --purple=1 $(BITLBEE_CONFIGURE_FLAGS)
     46        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)
    4747        $(MAKE) -C debian/build-libpurple
    4848endif
Note: See TracChangeset for help on using the changeset viewer.