Update of /cvsroot/leaf/src/bering-uclibc/apps/libusb
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20015
Modified Files:
buildtool.mk
Log Message:
fix leaking library problem, by Cedric Schieli
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/libusb/buildtool.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** buildtool.mk 27 Sep 2006 20:11:00 -0000 1.7
--- buildtool.mk 28 Sep 2006 21:51:24 -0000 1.8
***************
*** 13,29 ****
$(LIBUSB_DIR)/.configured: $(LIBUSB_DIR)/.source
(cd $(LIBUSB_DIR) ; CFLAGS="$(BT_COPT_FLAGS)"
CXXFLAGS="$(BT_COPT_FLAGS)" CC=$(TARGET_CC) CXX=$(BT_STAGING_DIR)/usr/bin/g++
LD=$(TARGET_LD) \
! ./configure --disable-build-docs)
touch $(LIBUSB_DIR)/.configured
$(LIBUSB_DIR)/.build: $(LIBUSB_DIR)/.configured
mkdir -p $(LIBUSB_TARGET_DIR)
! make -C $(LIBUSB_DIR) all
! $(BT_STRIP) $(BT_STRIP_LIBOPTS) $(LIBUSB_DIR)/.libs/libusb-0.1.so.4.4.4
! mkdir -p $(LIBUSB_TARGET_DIR)/usr/lib
! mkdir -p $(LIBUSB_TARGET_DIR)/usr/include
! mkdir -p $(LIBUSB_TARGET_DIR)/usr/bin
! cp -a $(LIBUSB_DIR)/.libs/*so* $(LIBUSB_TARGET_DIR)/usr/lib
! cp -a $(LIBUSB_DIR)/usb*.h $(LIBUSB_TARGET_DIR)/usr/include
! cp -a $(LIBUSB_DIR)/libusb-config $(LIBUSB_TARGET_DIR)/usr/bin
cp -a -f $(LIBUSB_TARGET_DIR)/usr/lib/* $(BT_STAGING_DIR)/usr/lib/
cp -a -f $(LIBUSB_TARGET_DIR)/usr/include/*
$(BT_STAGING_DIR)/usr/include
--- 13,25 ----
$(LIBUSB_DIR)/.configured: $(LIBUSB_DIR)/.source
(cd $(LIBUSB_DIR) ; CFLAGS="$(BT_COPT_FLAGS)"
CXXFLAGS="$(BT_COPT_FLAGS)" CC=$(TARGET_CC) CXX=$(BT_STAGING_DIR)/usr/bin/g++
LD=$(TARGET_LD) \
! ./configure --prefix=/usr --disable-build-docs)
touch $(LIBUSB_DIR)/.configured
$(LIBUSB_DIR)/.build: $(LIBUSB_DIR)/.configured
mkdir -p $(LIBUSB_TARGET_DIR)
! $(MAKE) -C $(LIBUSB_DIR) DESTDIR=$(LIBUSB_TARGET_DIR) install
! -$(BT_STRIP) $(BT_STRIP_LIBOPTS) $(LIBUSB_TARGET_DIR)/usr/lib/*.so*
! perl -i -p -e 's,/usr/lib,$(BT_STAGING_DIR)/usr/lib,g' \
! $(LIBUSB_TARGET_DIR)/usr/lib/*.la
cp -a -f $(LIBUSB_TARGET_DIR)/usr/lib/* $(BT_STAGING_DIR)/usr/lib/
cp -a -f $(LIBUSB_TARGET_DIR)/usr/include/*
$(BT_STAGING_DIR)/usr/include
***************
*** 34,38 ****
clean:
! make -C $(LIBUSB_DIR) clean
rm -rf $(LIBUSB_TARGET_DIR)
rm -rf $(LIBUSB_DIR)/.build
--- 30,40 ----
clean:
! -$(MAKE) -C $(LIBUSB_DIR) clean
! rm -f $(BT_STAGING_DIR)/usr/lib/libusb.*
! rm -f $(BT_STAGING_DIR)/usr/lib/libusbpp.*
! rm -f $(BT_STAGING_DIR)/usr/lib/pkgconfig/libusb.pc
! rm -f $(BT_STAGING_DIR)/usr/include/usb.h
! rm -f $(BT_STAGING_DIR)/usr/include/usbpp.h
! rm -f $(BT_STAGING_DIR)/usr/bin/libusb-config
rm -rf $(LIBUSB_TARGET_DIR)
rm -rf $(LIBUSB_DIR)/.build
***************
*** 41,43 ****
srcclean: clean
rm -rf $(LIBUSB_DIR)
- rm -rf $(LIBUSB_DIR)/.source
--- 43,44 ----
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
