X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fpmacct%2FMakefile;h=ff6cb07c12148735b606173e38833337262c8704;hb=24a56766ce95c57c28b92c25abd4637c06f92479;hp=57509cbe0a1f5fe7ddccf1148e2dba3474e2a865;hpb=b43f2e9fbddb868e9efd3178be4ccf92ee3a62a5;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/net/pmacct/Makefile b/net/pmacct/Makefile index 57509cbe0a..ff6cb07c12 100644 --- a/net/pmacct/Makefile +++ b/net/pmacct/Makefile @@ -15,11 +15,10 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.ba.cnr.it/~paolo/pmacct/ PKG_MD5SUM:=0be1ffd9d4bda73575caa3240abbf4cb -PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_BUILDDEP:=libpcap +PKG_BUILD_DEPENDS:=libpcap include $(INCLUDE_DIR)/package.mk @@ -85,105 +84,105 @@ define Package/pmacctd-sqlite DEPENDS+= +libsqlite3 endef -define Package/sfacctd/Default - $(call Package/pmacct/Default) - TITLE:=sFlow accounting daemon -endef - define Package/pmacct-client $(call Package/pmacct/Default) TITLE:=Command-line client to gather data from the IMT plugin endef - -ifneq ($(SDK),) - CONFIG_PACKAGE_nfacctd:=m - CONFIG_PACKAGE_nfacctd-mysql:=m - CONFIG_PACKAGE_nfacctd-pgsql:=m - CONFIG_PACKAGE_nfacctd-sqlite:=m - CONFIG_PACKAGE_pmacctd:=m - CONFIG_PACKAGE_pmacctd-mysql:=m - CONFIG_PACKAGE_pmacctd-pgsql:=m - CONFIG_PACKAGE_pmacctd-sqlite:=m -endif - define Compile/Template -$(PKG_BUILD_DIR)/nfacctd-$(1) $(PKG_BUILD_DIR)/pmacctd-$(1): $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/nfacctd$(1) $(PKG_BUILD_DIR)/pmacctd$(1): $(PKG_BUILD_DIR)/.configured -$(MAKE) -C $(PKG_BUILD_DIR) distclean $(call Build/Configure/Default, \ --with-pcap-includes="$(STAGING_DIR)/usr/include" \ --with-pcap-libs="$(STAGING_DIR)/usr/lib" \ $(2) \ - , \ + ,\ LIBS="-lz" \ + ,,\ ); $(MAKE) -C $(PKG_BUILD_DIR) \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ all - mv -f $(PKG_BUILD_DIR)/src/nfacctd $(PKG_BUILD_DIR)/nfacctd-$(1) - mv -f $(PKG_BUILD_DIR)/src/pmacctd $(PKG_BUILD_DIR)/pmacctd-$(1) + mv -f $(PKG_BUILD_DIR)/src/nfacctd $(PKG_BUILD_DIR)/nfacctd$(1) + mv -f $(PKG_BUILD_DIR)/src/pmacctd $(PKG_BUILD_DIR)/pmacctd$(1) -$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/nfacctd-$(1) $(PKG_BUILD_DIR)/pmacctd-$(1) +$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/nfacctd$(1) $(PKG_BUILD_DIR)/pmacctd$(1) endef define Install/Template -define Package/$(1)/conffiles -/etc/default/$(3) -/etc/$(3).conf +define Package/$(1)$(2)/conffiles +/etc/default/$(1) +/etc/$(1).conf endef -define Package/$(1)/install - install -d -m0755 $$(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/$(2) $$(1)/usr/sbin/$(3) - install -d -m0755 $$(1)/etc - install -m0644 ./files/$(3).conf $$(1)/etc/ - install -d -m0755 $$(1)/etc/default - install -m0644 ./files/$(3).default $$(1)/etc/default/$(3) - install -d -m0755 $$(1)/etc/init.d - install -m0755 ./files/$(3).init $$(1)/etc/init.d/$(3) +define Package/$(1)$(2)/install + $(INSTALL_DIR) $$(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(1)$(2) $$(1)/usr/sbin/$(1) + $(INSTALL_DIR) $$(1)/etc + $(INSTALL_DATA) ./files/$(1).conf $$(1)/etc/ + $(INSTALL_DIR) $$(1)/etc/default + $(INSTALL_DATA) ./files/$(1).default $$(1)/etc/default/$(1) + $(INSTALL_DIR) $$(1)/etc/init.d + $(INSTALL_BIN) ./files/$(1).init $$(1)/etc/init.d/$(1) endef endef - -ifneq ($(CONFIG_PACKAGE_nfacctd)$(CONFIG_PACKAGE_pmacctd),) - $(eval $(call Compile/Template,basic)) - $(eval $(call Install/Template,nfacctd,nfacctd-basic,nfacctd)) - $(eval $(call Install/Template,pmacctd,pmacctd-basic,pmacctd)) +ifneq ($(SDK)$(CONFIG_PACKAGE_nfacctd)$(CONFIG_PACKAGE_pmacctd),) + define Compile/pmacct/basic + $(call Compile/Template,, \ + --disable-mysql \ + --disable-pgsql \ + --disable-sqlite3 \ + ) + $(call Install/Template,nfacctd,) + $(call Install/Template,pmacctd,) + endef endif -ifneq ($(CONFIG_PACKAGE_nfacctd-mysql)$(CONFIG_PACKAGE_pmacctd-mysql),) - $(eval $(call Compile/Template,mysql, \ - --enable-mysql \ - --with-mysql-includes="$(STAGING_DIR)/usr/include" \ - --with-mysql-libs="$(STAGING_DIR)/usr/lib/mysql" \ - , \ - LIBS='-lz' \ - )) - $(eval $(call Install/Template,nfacctd-mysql,nfacctd-mysql,nfacctd)) - $(eval $(call Install/Template,pmacctd-mysql,pmacctd-mysql,pmacctd)) +$(eval $(Compile/pmacct/basic)) + +ifneq ($(SDK)$(CONFIG_PACKAGE_nfacctd-mysql)$(CONFIG_PACKAGE_pmacctd-mysql),) + define Compile/pmacct/mysql + $(call Compile/Template,-mysql, \ + --enable-mysql \ + --with-mysql-includes="$(STAGING_DIR)/usr/include" \ + --with-mysql-libs="$(STAGING_DIR)/usr/lib/mysql" \ + ) + $(call Install/Template,nfacctd,-mysql) + $(call Install/Template,pmacctd,-mysql) + endef endif -ifneq ($(CONFIG_PACKAGE_nfacctd-pgsql)$(CONFIG_PACKAGE_pmacctd-pgsql),) - $(eval $(call Compile/Template,pgsql, \ - --enable-pgsql \ - --with-pgsql-includes="$(STAGING_DIR)/usr/include" \ - --with-pgsql-libs="$(STAGING_DIR)/usr/lib" \ - )) - $(eval $(call Install/Template,nfacctd-pgsql,nfacctd-pgsql,nfacctd)) - $(eval $(call Install/Template,pmacctd-pgsql,pmacctd-pgsql,pmacctd)) +$(eval $(Compile/pmacct/mysql)) + +ifneq ($(SDK)$(CONFIG_PACKAGE_nfacctd-pgsql)$(CONFIG_PACKAGE_pmacctd-pgsql),) + define Compile/pmacct/pgsql + $(call Compile/Template,-pgsql, \ + --enable-pgsql \ + --with-pgsql-includes="$(STAGING_DIR)/usr/include" \ + --with-pgsql-libs="$(STAGING_DIR)/usr/lib" \ + ) + $(call Install/Template,nfacctd,-pgsql) + $(call Install/Template,pmacctd,-pgsql) + endef endif -ifneq ($(CONFIG_PACKAGE_nfacctd-sqlite)$(CONFIG_PACKAGE_pmacctd-sqlite),) - $(eval $(call Compile/Template,sqlite, \ - --enable-sqlite3 \ - --with-sqlite3-includes="$(STAGING_DIR)/usr/include" \ - --with-sqlite3-libs="$(STAGING_DIR)/usr/lib" \ - )) - $(eval $(call Install/Template,nfacctd-sqlite,nfacctd-sqlite,nfacctd)) - $(eval $(call Install/Template,pmacctd-sqlite,pmacctd-sqlite,pmacctd)) +$(eval $(Compile/pmacct/pgsql)) + +ifneq ($(SDK)$(CONFIG_PACKAGE_nfacctd-sqlite)$(CONFIG_PACKAGE_pmacctd-sqlite),) + define Compile/pmacct/sqlite + $(call Compile/Template,-sqlite, \ + --enable-sqlite3 \ + --with-sqlite3-includes="$(STAGING_DIR)/usr/include" \ + --with-sqlite3-libs="$(STAGING_DIR)/usr/lib" \ + ) + $(call Install/Template,nfacctd,-sqlite) + $(call Install/Template,pmacctd,-sqlite) + endef endif +$(eval $(Compile/pmacct/sqlite)) define Build/Configure endef @@ -192,7 +191,7 @@ define Build/Compile endef define Package/pmacct-client/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/src/pmacct $(1)/usr/sbin/ endef