bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix various makefile errors (#1236)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@6175 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-01-22 08:48:37 +00:00
parent 91efbbae78
commit 2561f9bf5d
1 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
net/pmacct/Makefile
View File

@ -95,7 +95,6 @@ define Package/pmacct-client
TITLE:=Command-line client to gather data from the IMT plugin TITLE:=Command-line client to gather data from the IMT plugin
endef endef
ifneq ($(SDK),) ifneq ($(SDK),)
CONFIG_PACKAGE_nfacctd:=m CONFIG_PACKAGE_nfacctd:=m
CONFIG_PACKAGE_nfacctd-mysql:=m CONFIG_PACKAGE_nfacctd-mysql:=m
@ -114,9 +113,10 @@ $(PKG_BUILD_DIR)/nfacctd-$(1) $(PKG_BUILD_DIR)/pmacctd-$(1): $(PKG_BUILD_DIR)/.c
$(call Build/Configure/Default, \ $(call Build/Configure/Default, \
--with-pcap-includes="$(STAGING_DIR)/usr/include" \ --with-pcap-includes="$(STAGING_DIR)/usr/include" \
--with-pcap-libs="$(STAGING_DIR)/usr/lib" \ --with-pcap-libs="$(STAGING_DIR)/usr/lib" \
"$(2)" \ $(2) \
,\ ,\
LIBS+="-lz" \ LIBS="-lz" \
,
); );
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
@ -124,7 +124,9 @@ $(PKG_BUILD_DIR)/nfacctd-$(1) $(PKG_BUILD_DIR)/pmacctd-$(1): $(PKG_BUILD_DIR)/.c
mv -f $(PKG_BUILD_DIR)/src/nfacctd $(PKG_BUILD_DIR)/nfacctd-$(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) 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) ifneq ($(CONFIG_PACKAGE_nfacctd$(3))$(CONFIG_PACKAGE_pmacctd$(3)),)
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/nfacctd-$(1) $(PKG_BUILD_DIR)/pmacctd-$(1)
endif
endef endef
@ -150,38 +152,34 @@ endef
endef endef
ifneq ($(CONFIG_PACKAGE_nfacctd)$(CONFIG_PACKAGE_pmacctd),) $(eval $(call Compile/Template,basic,,))
$(eval $(call Compile/Template,basic)) $(eval $(call Install/Template,nfacctd,nfacctd-basic,nfacctd))
$(eval $(call Install/Template,nfacctd,nfacctd-basic,nfacctd)) $(eval $(call Install/Template,pmacctd,pmacctd-basic,pmacctd))
$(eval $(call Install/Template,pmacctd,pmacctd-basic,pmacctd))
endif $(eval $(call Compile/Template,mysql, \
ifneq ($(CONFIG_PACKAGE_nfacctd-mysql)$(CONFIG_PACKAGE_pmacctd-mysql),) --enable-mysql \
$(eval $(call Compile/Template,mysql, \ --with-mysql-includes="$(STAGING_DIR)/usr/include" \
--enable-mysql \ --with-mysql-libs="$(STAGING_DIR)/usr/lib/mysql" \
--with-mysql-includes="$(STAGING_DIR)/usr/include" \ ,-mysql))
--with-mysql-libs="$(STAGING_DIR)/usr/lib/mysql" \ $(eval $(call Install/Template,nfacctd-mysql,nfacctd-mysql,nfacctd))
)) $(eval $(call Install/Template,pmacctd-mysql,pmacctd-mysql,pmacctd))
$(eval $(call Install/Template,nfacctd-mysql,nfacctd-mysql,nfacctd))
$(eval $(call Install/Template,pmacctd-mysql,pmacctd-mysql,pmacctd)) $(eval $(call Compile/Template,pgsql, \
endif --enable-pgsql \
ifneq ($(CONFIG_PACKAGE_nfacctd-pgsql)$(CONFIG_PACKAGE_pmacctd-pgsql),) --with-pgsql-includes="$(STAGING_DIR)/usr/include" \
$(eval $(call Compile/Template,pgsql, \ --with-pgsql-libs="$(STAGING_DIR)/usr/lib" \
--enable-pgsql \ ,-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 $(call Install/Template,nfacctd-pgsql,nfacctd-pgsql,nfacctd))
$(eval $(call Install/Template,pmacctd-pgsql,pmacctd-pgsql,pmacctd)) $(eval $(call Compile/Template,sqlite, \
endif --enable-sqlite3 \
ifneq ($(CONFIG_PACKAGE_nfacctd-sqlite)$(CONFIG_PACKAGE_pmacctd-sqlite),) --with-sqlite3-includes="$(STAGING_DIR)/usr/include" \
$(eval $(call Compile/Template,sqlite, \ --with-sqlite3-libs="$(STAGING_DIR)/usr/lib" \
--enable-sqlite3 \ ,-sqlite))
--with-sqlite3-includes="$(STAGING_DIR)/usr/include" \ $(eval $(call Install/Template,nfacctd-sqlite,nfacctd-sqlite,nfacctd))
--with-sqlite3-libs="$(STAGING_DIR)/usr/lib" \ $(eval $(call Install/Template,pmacctd-sqlite,pmacctd-sqlite,pmacctd))
))
$(eval $(call Install/Template,nfacctd-sqlite,nfacctd-sqlite,nfacctd))
$(eval $(call Install/Template,pmacctd-sqlite,pmacctd-sqlite,pmacctd))
endif
define Build/Configure define Build/Configure
endef endef