X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Frrs%2FMakefile;h=4ff8441f43467a5072d1488cf5c7309f5e44af6c;hp=c90dc0ce8f59d86a73df6e860fb6bc33f96478a2;hb=00c5a36c73a846f489690beb2140773435e9fb1c;hpb=e8530ab36edabf9966c852e57292c647a3004f0d

diff --git a/net/rrs/Makefile b/net/rrs/Makefile
index c90dc0ce8f..4ff8441f43 100644
--- a/net/rrs/Makefile
+++ b/net/rrs/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -21,64 +20,70 @@ include $(INCLUDE_DIR)/package.mk
 define Package/rrs/Default
   SECTION:=net
   CATEGORY:=Network
-  MENU:=1
   DEPENDS:=+uclibcxx
   TITLE:=A reverse (connecting) remote shell
   URL:=http://www.cycom.se/dl/rrs/
 endef
 
 define Package/rrs
-  $(call Package/rrs/Default)
-  DEPENDS+=+libopenssl
+$(call Package/rrs/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS+= +libopenssl
   TITLE+= (with SSL support)
+  URL:=http://www.cycom.se/dl/rrs/
 endef
 
 define Package/rrs-nossl
-  $(call Package/rrs/Default)
-  DEPENDS+=rrs
+$(call Package/rrs/Default)
+  SECTION:=net
+  CATEGORY:=Network
   TITLE+= (without SSL support)
 endef
 
-ifneq ($(SDK),)
-  CONFIG_PACKAGE_rrs:=m
-  CONFIG_PACKAGE_rrs-nossl:=m
-endif
 
-define Build/Compile/Template
+define Build/Template
+
+$(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -fno-builtin -fno-rtti -nostdinc++" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic $(3) -lutil -lm -lc" \
-		$(2)
-	( cd $(PKG_BUILD_DIR); mv rrs rrs-$(1); )
-endef
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++ -fno-builtin -fno-rtti -nostdinc++" \
+		LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs $(4) -luClibc++ -lm -lutil" \
+		LDFLAGSNOSSL="$(TARGET_LDFLAGS) -nodefaultlibs $(4) -luClibc++ -lm -lutil" \
+		$(3)
+	( cd $(PKG_BUILD_DIR); mv -f rrs rrs-$(2); )
+	touch $$@
 
-ifneq ($(CONFIG_PACKAGE_rrs),)
-  define Build/Compile/with-ssl
-	$(call Build/Compile/Template,ssl,generic,-lcrypto -lssl)
-  endef
-endif
+$(STAMP_BUILT): $(STAMP_BUILT)-$(2)
 
-ifneq ($(CONFIG_PACKAGE_rrs-nossl),)
-  define Build/Compile/without-ssl
-	$(call Build/Compile/Template,nossl,generic-nossl,)
-  endef
-endif
+define Package/$(1)/install
+	$(INSTALL_DIR) $$(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rrs-$(2) $$(1)/usr/bin/rrs
+endef
 
-define Build/Compile
-	$(call Build/Compile/with-ssl)
-	$(call Build/Compile/without-ssl)
 endef
 
-define Package/rrs/install	
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rrs-ssl $(1)/usr/bin/rrs
+
+define Build/Configure
 endef
 
-define Package/rrs-nossl/install	
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rrs-nossl $(1)/usr/bin/rrs
+define Build/Compile
 endef
 
+ifneq ($(SDK)$(CONFIG_PACKAGE_rrs),)
+  define Build/with-ssl
+    $(call Build/Template,rrs,with-ssl,generic,-lcrypto -lssl)
+  endef
+endif
+$(eval $(Build/with-ssl))
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_rrs-nossl),)
+  define Build/without-ssl
+    $(call Build/Template,rrs-nossl,without-ssl,generic-nossl,)
+  endef
+endif
+$(eval $(Build/without-ssl))
+
+
 $(eval $(call BuildPackage,rrs))
 $(eval $(call BuildPackage,rrs-nossl))