Ticket #90: as-needed.patch

File as-needed.patch, 4.3 kB (added by Chewi, 3 years ago)

  • common/include/app.mak 

    diff -Naur cwiid-9999.orig/common/include/app.mak cwiid-9999/common/include/app.mak
    old new  
    1010all: $(APP_NAME) 
    1111 
    1212$(APP_NAME): $(OBJECTS) 
    13         $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LDLIBS) 
     13        $(CC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@ 
    1414 
    1515install: $(APP_NAME) 
    1616        install -D $(APP_NAME) $(DEST_INST_DIR)/$(APP_NAME) 

  • common/include/lib.mak.in 

    diff -Naur cwiid-9999.orig/common/include/lib.mak.in cwiid-9999/common/include/lib.mak.in
    old new  
    2525        ar rcs $(STATIC_LIB) $(OBJECTS) 
    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) $(OBJECTS) \ 
     29              $(LDLIBS) -o $(SHARED_LIB)  
    3030 
    3131install: install_header install_static install_shared 
    3232 

  • common/include/plugin.mak 

    diff -Naur cwiid-9999.orig/common/include/plugin.mak cwiid-9999/common/include/plugin.mak
    old new  
    1616all: $(LIB_NAME) 
    1717 
    1818$(LIB_NAME): $(OBJECTS) 
    19         $(CC) -shared $(LDFLAGS) $(LDLIBS) -o $(LIB_NAME) $(OBJECTS) 
     19        $(CC) -shared $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $(LIB_NAME) 
    2020 
    2121install: $(LIB_NAME) 
    2222        install -D $(LIB_NAME) $(DEST_INST_DIR)/$(LIB_NAME) 

  • libcwiid/cwiid.pc.in 

    diff -Naur cwiid-9999.orig/libcwiid/cwiid.pc.in cwiid-9999/libcwiid/cwiid.pc.in
    old new  
    99Name: CWiid 
    1010Description: CWiid Wiimote Interface 
    1111Version: @PACKAGE_VERSION@ 
    12 Requires: bluez 
     12Requires.private: bluez 
    1313Libs: -L${libdir} -lcwiid 
     14Libs.private: -lpthread -lrt 
    1415Cflags: -I${includedir} 

  • lswm/Makefile.in 

    diff -Naur cwiid-9999.orig/lswm/Makefile.in cwiid-9999/lswm/Makefile.in
    old new  
    88 
    99CFLAGS += -I@top_builddir@/libcwiid 
    1010LDFLAGS += -L@top_builddir@/libcwiid 
    11 LDLIBS += -lcwiid 
     11LDLIBS += -lcwiid -lbluetooth 
    1212INST_DIR = @bindir@ 
    1313 
    1414include $(COMMON)/include/app.mak 

  • python/Makefile.in 

    diff -Naur cwiid-9999.orig/python/Makefile.in cwiid-9999/python/Makefile.in
    old new  
    77endif 
    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: 
    1313        $(PYTHON) setup.py install --install-lib=${libdir}/python@PYTHON_VERSION@/site-packages $(SET_ROOT_DIR) 

  • wmdemo/Makefile.in 

    diff -Naur cwiid-9999.orig/wmdemo/Makefile.in cwiid-9999/wmdemo/Makefile.in
    old new  
    88 
    99CFLAGS += -I@top_builddir@/libcwiid 
    1010LDFLAGS += -L@top_builddir@/libcwiid 
    11 LDLIBS += -lcwiid 
     11LDLIBS += -lcwiid -lbluetooth 
    1212INST_DIR = @bindir@ 
    1313 
    1414include $(COMMON)/include/app.mak 

  • wmgui/Makefile.in 

    diff -Naur cwiid-9999.orig/wmgui/Makefile.in cwiid-9999/wmgui/Makefile.in
    old new  
    88 
    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 
    1414include $(COMMON)/include/app.mak 

  • wminput/Makefile.in 

    diff -Naur cwiid-9999.orig/wminput/Makefile.in cwiid-9999/wminput/Makefile.in
    old new  
    1414        -DWMINPUT_CONFIG_DIR=\"$(WMINPUT_CONFIG_DIR)\" \ 
    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@ 
    2020