tweak snort & snort-wireless makefiles

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

diff --git a/net/snort/Makefile b/net/snort/Makefile
index 817768a727672694944f7c8cc1ae83d0dc301c37..7be3bc49ca4b16c5979fa6475488e6be6794e08b 100644 (file)
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -48,15 +48,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 +72,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,36 +107,36 @@ endef
 endef
 
 
 endef
 
 

-ifneq ($(CONFIG_PACKAGE_snort),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_snort),)

   define Compile/snort
   define Compile/snort

-    $(call Compile/Template,basic, \
+    $(call Compile/Template,, \

                --without-mysql \
                --without-postgresql \
     )
                --without-mysql \
                --without-postgresql \
     )

-    $(call Install/Template,snort,basic)
+    $(call Install/Template,)

   endef
 endif
 $(eval $(Compile/snort))
 
   endef
 endif
 $(eval $(Compile/snort))
 

-ifneq ($(CONFIG_PACKAGE_snort-mysql),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_snort-mysql),)

   define Compile/snort-mysql
   define Compile/snort-mysql

-    $(call Compile/Template,mysql, \
+    $(call Compile/Template,-mysql, \

                --with-mysql="$(STAGING_DIR)/usr" \
                --without-postgresql \
     )
                --with-mysql="$(STAGING_DIR)/usr" \
                --without-postgresql \
     )

-    $(call Install/Template,snort-mysql,mysql)
+    $(call Install/Template,-mysql)

   endef
 endif
 $(eval $(Compile/snort-mysql))
 
 
   endef
 endif
 $(eval $(Compile/snort-mysql))
 
 

-ifneq ($(CONFIG_PACKAGE_snort-pgsql),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_snort-pgsql),)

   define Compile/snort-pgsql
   define Compile/snort-pgsql

-    $(call Compile/Template,pgsql, \
+    $(call Compile/Template,-pgsql, \

                --without-mysql \
                --with-postgresql="$(STAGING_DIR)/usr" \
     )
                --without-mysql \
                --with-postgresql="$(STAGING_DIR)/usr" \
     )

-    $(call Install/Template,snort-pgsql,pgsql)
+    $(call Install/Template,-pgsql)

   endef
 endif
 $(eval $(Compile/snort-pgsql))
   endef
 endif
 $(eval $(Compile/snort-pgsql))