fix cbtt compile

[openwrt/svn-archive/archive.git] / net / cbtt / Makefile

diff --git a/net/cbtt/Makefile b/net/cbtt/Makefile
index 34025a7228327f369b089bbb6eb06f2590148360..e38aa81b7dd7afb43fe61cff6f17e8b5c88d1901 100644 (file)
--- a/net/cbtt/Makefile
+++ b/net/cbtt/Makefile
@@ -16,43 +16,69 @@ PKG_SOURCE_URL:=@SF/bnbtusermods
 PKG_MD5SUM:=d6edf0a11d7e68fa3d121e91308f22f5
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)80-$(PKG_VERSION)-src
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/cbtt
+define Package/cbtt/Default
+  SUBMENU:=BitTorrent
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=zlib
-  MENU:=1
+  DEPENDS:=+libpthread +uclibcxx +zlib
   TITLE:=Bittorrent tracker
-  DEPENDS:=+libpthread +uclibcxx
-  DESCRIPTION:=a C BitTorrent Tracker
-  URL:=http://bnbtusermods.sourceforge.net
+  URL:=http://bnbtusermods.sourceforge.net/
+endef
+
+define Package/cbtt
+$(call Package/cbtt/Default)
 endef
 
 define Package/cbtt-mysql
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=cbtt +libmysqlclient
-  TITLE:=Bittorrent tracker with mysql support
-  DESCRIPTION:=Bittorrent tracker with mysql support
-  URL:=http://bnbtusermods.sourceforge.net
+$(call Package/cbtt/Default)
+  DEPENDS+= +libmysqlclient
+  TITLE+= (with mysql support)
 endef
 
-MAKE_FLAGS += \
-       LFLAGS="-L$(STAGING_DIR)/usr/lib -L $(STAGING_DIR)/usr/lib/mysql -L. -lz -lmysqlclient -nodefaultlibs -lpthread -luClibc++ -lc -lm -lgcc" \
-       CFLAGS="-I$(STAGING_DIR)/usr/include -fno-builtin -fno-rtti -nostdinc++"
 
-define Package/cbtt/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/bnbt $(1)/usr/bin/
+define Build/Template
+
+$(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++ -fno-builtin -nostdinc++" \
+               LFLAGS="$(TARGET_LDFLAGS) -L. -nodefaultlibs $(4) -lz -luClibc++ -lm -lpthread -lgcc" \
+               $(3)
+       touch $$@
+
+$(STAMP_BUILT): $(STAMP_BUILT)-$(2)
+
+define Package/$(1)/install
+       $(INSTALL_DIR) $$(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(3) $$(1)/usr/bin/
+endef
+
 endef
 
-define Package/cbtt-mysql/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/bnbtmysql $(1)/usr/bin/
+define Build/Configure
 endef
 
+define Build/Compile
+endef
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_cbtt),)
+  define Build/without-mysql
+    $(call Build/Template,cbtt,without-mysql,bnbt,)
+  endef
+endif
+$(eval $(Build/without-mysql))
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_cbtt-mysql),)
+  define Build/with-mysql
+    $(call Build/Template,cbtt-mysql,with-mysql,bnbtmysql, \
+       -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient \
+    )
+  endef
+endif
+$(eval $(Build/with-mysql))
+
 $(eval $(call BuildPackage,cbtt))
 $(eval $(call BuildPackage,cbtt-mysql))