Changeset 6af678616531eb1f3d3d0a052313ef9d8125bac7

Show
Ignore:
Timestamp:
02/05/10 03:53:41 (3 years ago)
Author:
L. Donnie Smith <donnie.smith@…>
Children:
69c758d6b8d0796f2d72a6d334be1e259fc45ab4
Parents:
2100f14c612471084434b364501e3818c7f4144e
git-committer:
L. Donnie Smith <donnie.smith@…> (02/05/10 03:53:41)
Message:

fix link options for --as-needed (#90)

also fix a couple of includes

Files:
11 modified

Legend:

Unmodified
Added
Removed

  • common/include/app.mak

    r49e0132 r6af6786  
    1111 
    1212$(APP_NAME): $(OBJECTS) 
    13         $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LDLIBS) 
     13        $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LDLIBS) 
    1414 
    1515install: $(APP_NAME) 

  • common/include/lib.mak.in

    r49e0132 r6af6786  
    2626 
    2727$(SHARED_LIB): $(OBJECTS) 
    28         $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) $(LDLIBS) \ 
    29               -o $(SHARED_LIB) $(OBJECTS) 
     28        $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $(SHARED_LIB) \ 
     29              $(OBJECTS) $(LDLIBS) 
    3030 
    3131install: install_header install_static install_shared 

  • common/include/plugin.mak

    r49e0132 r6af6786  
    1717 
    1818$(LIB_NAME): $(OBJECTS) 
    19         $(CC) -shared $(LDFLAGS) $(LDLIBS) -o $(LIB_NAME) $(OBJECTS) 
     19        $(CC) -shared $(LDFLAGS) -o $(LIB_NAME) $(OBJECTS) $(LDLIBS) 
    2020 
    2121install: $(LIB_NAME) 

  • lswm/Makefile.in

    r8dfafdd r6af6786  
    99CFLAGS += -I@top_builddir@/libcwiid 
    1010LDFLAGS += -L@top_builddir@/libcwiid 
    11 LDLIBS += -lcwiid 
     11LDLIBS += -lcwiid -lbluetooth 
    1212INST_DIR = @bindir@ 
    1313 

  • python/Makefile.in

    r20376e4 r6af6786  
    88 
    99all: 
    10         $(PYTHON) setup.py build_ext $(DEBUGFLAGS) -I@top_builddir@/libcwiid -L@top_builddir@/libcwiid -lcwiid 
     10        $(PYTHON) setup.py build_ext $(DEBUGFLAGS) -I@top_builddir@/libcwiid -L@top_builddir@/libcwiid -lcwiid -lbluetooth 
    1111 
    1212install: 

  • python/Wiimote.c

    r2100f14 r6af6786  
    2525#include <errno.h> 
    2626#include <bluetooth/bluetooth.h> 
    27 #include "cwiid.h" 
     27#include <cwiid.h> 
    2828 
    2929#if (PY_VERSION_HEX < 0x02050000) 

  • python/cwiidmodule.c

    r2100f14 r6af6786  
    2525#include <stdlib.h> 
    2626 
    27 #include "cwiid.h" 
     27#include <cwiid.h> 
    2828#include "structmember.h" 
    2929 

  • wmdemo/wmdemo.c

    rc12d0e1 r6af6786  
    33#include <stdlib.h> 
    44 
     5#include <bluetooth/bluetooth.h> 
    56#include <cwiid.h> 
    67 

  • wmgui/Makefile.in

    r8dfafdd r6af6786  
    99CFLAGS += @GTK_CFLAGS@ -I@top_builddir@/libcwiid 
    1010LDFLAGS += -L@top_builddir@/libcwiid 
    11 LDLIBS += @GTK_LIBS@ -lm -lcwiid 
     11LDLIBS += @GTK_LIBS@ -lcwiid -lbluetooth -lm 
    1212INST_DIR = @bindir@ 
    1313 

  • wminput/Makefile.in

    r6f6c678 r6af6786  
    1515        -DCWIID_PLUGINS_DIR=\"$(CWIID_PLUGINS_DIR)\" 
    1616 
    17 LDLIBS += -lcwiid -ldl 
     17LDLIBS += -lcwiid -lbluetooth -ldl -lpthread 
    1818LDFLAGS += -L@top_builddir@/libcwiid -rdynamic 
    1919INST_DIR = @bindir@ 

  • wminput/main.c

    r2100f14 r6af6786  
    3131#include <sys/types.h> 
    3232#include <unistd.h> 
     33#include <bluetooth/bluetooth.h> 
    3334 
    3435#include <cwiid.h>