projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add vnstati (#4311)
[openwrt/svn-archive/archive.git]
/
net
/
snort
/
Makefile
diff --git
a/net/snort/Makefile
b/net/snort/Makefile
index 7dfc28b24a280bbdb14b78e7517b63aab2eab1b0..b66ef0786ecee9e3720cba2c8ceeac443afb3f7c 100644
(file)
--- a/
net/snort/Makefile
+++ b/
net/snort/Makefile
@@
-15,10
+15,6
@@
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.snort.org/dl/current/
PKG_MD5SUM:=9dc9060d1f2e248663eceffadfc45e7e
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.snort.org/dl/current/
PKG_MD5SUM:=9dc9060d1f2e248663eceffadfc45e7e
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/package.mk
@@
-48,15
+44,9
@@
define Package/snort-pgsql
endef
endef
-ifneq ($(SDK),)
- CONFIG_PACKAGE_snort:=m
- CONFIG_PACKAGE_snort-mysql:=m
- CONFIG_PACKAGE_snort-pgsql:=m
-endif
-
define Compile/Template
define Compile/Template
-$(PKG_BUILD_DIR)/snort
-
$(1): $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/snort$(1): $(PKG_BUILD_DIR)/.configured
touch -r $(PKG_BUILD_DIR)/Makefile.am $(PKG_BUILD_DIR)/configure.in
touch -r $(PKG_BUILD_DIR)/Makefile.in $(PKG_BUILD_DIR)/configure
-$(MAKE) -C $(PKG_BUILD_DIR) distclean
touch -r $(PKG_BUILD_DIR)/Makefile.am $(PKG_BUILD_DIR)/configure.in
touch -r $(PKG_BUILD_DIR)/Makefile.in $(PKG_BUILD_DIR)/configure
-$(MAKE) -C $(PKG_BUILD_DIR) distclean
@@
-78,24
+68,24
@@
$(PKG_BUILD_DIR)/snort-$(1): $(PKG_BUILD_DIR)/.configured
$(MAKE) -C $(PKG_BUILD_DIR) \
extra_incl="" \
all
$(MAKE) -C $(PKG_BUILD_DIR) \
extra_incl="" \
all
- mv $(PKG_BUILD_DIR)/src/snort $(PKG_BUILD_DIR)/snort
-
$(1)
+ mv $(PKG_BUILD_DIR)/src/snort $(PKG_BUILD_DIR)/snort$(1)
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/snort
-
$(1)
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/snort$(1)
endef
define Install/Template
endef
define Install/Template
-define Package/$(1)/conffiles
+define Package/
snort
$(1)/conffiles
/etc/default/snort
/etc/snort/snort.conf
/etc/snort/threshold.conf
endef
/etc/default/snort
/etc/snort/snort.conf
/etc/snort/threshold.conf
endef
-define Package/$(1)/install
+define Package/
snort
$(1)/install
$(INSTALL_DIR) $$(1)/usr/sbin
$(INSTALL_DIR) $$(1)/usr/sbin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/snort
-$(2
) $$(1)/usr/sbin/snort
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/snort
$(1
) $$(1)/usr/sbin/snort
$(INSTALL_DIR) $$(1)/etc/snort
$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/snort.conf $$(1)/etc/snort/
$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/classification.config $$(1)/etc/snort/
$(INSTALL_DIR) $$(1)/etc/snort
$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/snort.conf $$(1)/etc/snort/
$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/classification.config $$(1)/etc/snort/
@@
-113,27
+103,39
@@
endef
endef
endef
-ifneq ($(CONFIG_PACKAGE_snort),)
- $(eval $(call Compile/Template,basic, \
+ifneq ($(SDK)$(CONFIG_PACKAGE_snort),)
+ define Compile/snort
+ $(call Compile/Template,, \
--without-mysql \
--without-postgresql \
--without-mysql \
--without-postgresql \
- ))
- $(eval $(call Install/Template,snort,basic))
+ )
+ $(call Install/Template,)
+ endef
endif
endif
-ifneq ($(CONFIG_PACKAGE_snort-mysql),)
- $(eval $(call Compile/Template,mysql, \
+$(eval $(Compile/snort))
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_snort-mysql),)
+ define Compile/snort-mysql
+ $(call Compile/Template,-mysql, \
--with-mysql="$(STAGING_DIR)/usr" \
--without-postgresql \
--with-mysql="$(STAGING_DIR)/usr" \
--without-postgresql \
- ))
- $(eval $(call Install/Template,snort-mysql,mysql))
+ )
+ $(call Install/Template,-mysql)
+ endef
endif
endif
-ifneq ($(CONFIG_PACKAGE_snort-pgsql),)
- $(eval $(call Compile/Template,pgsql, \
+$(eval $(Compile/snort-mysql))
+
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_snort-pgsql),)
+ define Compile/snort-pgsql
+ $(call Compile/Template,-pgsql, \
--without-mysql \
--with-postgresql="$(STAGING_DIR)/usr" \
--without-mysql \
--with-postgresql="$(STAGING_DIR)/usr" \
- ))
- $(eval $(call Install/Template,snort-pgsql,pgsql))
+ )
+ $(call Install/Template,-pgsql)
+ endef
endif
endif
+$(eval $(Compile/snort-pgsql))
define Build/Configure
endef
define Build/Configure
endef