mirror of https://bitbucket.org/anguist/ntpa
Remove pkg-config requirements
This commit is contained in:
parent
d0cd317033
commit
d554d98310
|
@ -2,7 +2,8 @@
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
../MySql.Data \
|
../MySql.Data \
|
||||||
../Npgsql \
|
../Npgsql \
|
||||||
../Newtonsoft.Json.dll
|
../NPlot \
|
||||||
|
../Newtonsoft.Json
|
||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
Ntp.Analyzer.Objects \
|
Ntp.Analyzer.Objects \
|
||||||
|
|
|
@ -34,6 +34,7 @@ NTP_DATA_PROVIDER_DLL_MDB_SOURCE=../bin/Ntp.Data.Provider.dll.mdb
|
||||||
NTP_DATA_PROVIDER_DLL_MDB=$(BUILD_DIR)/Ntp.Data.Provider.dll.mdb
|
NTP_DATA_PROVIDER_DLL_MDB=$(BUILD_DIR)/Ntp.Data.Provider.dll.mdb
|
||||||
MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll
|
MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll
|
||||||
NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll
|
NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll
|
||||||
|
NPLOT_DLL_SOURCE=../packages/NPlot.0.9.10.0/lib/net20/NPlot.dll
|
||||||
NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll
|
NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll
|
||||||
NTP_ANALYZER_IMPORT_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Import.dll.mdb
|
NTP_ANALYZER_IMPORT_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Import.dll.mdb
|
||||||
NTP_ANALYZER_IMPORT_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Import.dll.mdb
|
NTP_ANALYZER_IMPORT_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Import.dll.mdb
|
||||||
|
@ -67,6 +68,7 @@ NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll
|
||||||
NTP_DATA_PROVIDER_DLL_MDB=
|
NTP_DATA_PROVIDER_DLL_MDB=
|
||||||
MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll
|
MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll
|
||||||
NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll
|
NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll
|
||||||
|
NPLOT_DLL_SOURCE=../packages/NPlot.0.9.10.0/lib/net20/NPlot.dll
|
||||||
NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll
|
NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll
|
||||||
NTP_ANALYZER_IMPORT_DLL_MDB=
|
NTP_ANALYZER_IMPORT_DLL_MDB=
|
||||||
|
|
||||||
|
@ -89,6 +91,7 @@ PROGRAMFILES = \
|
||||||
$(NTP_DATA_PROVIDER_DLL_MDB) \
|
$(NTP_DATA_PROVIDER_DLL_MDB) \
|
||||||
$(MYSQL_DATA_DLL) \
|
$(MYSQL_DATA_DLL) \
|
||||||
$(NPGSQL_DLL) \
|
$(NPGSQL_DLL) \
|
||||||
|
$(NPLOT_DLL) \
|
||||||
$(NTP_ANALYZER_IMPORT_DLL) \
|
$(NTP_ANALYZER_IMPORT_DLL) \
|
||||||
$(NTP_ANALYZER_IMPORT_DLL_MDB)
|
$(NTP_ANALYZER_IMPORT_DLL_MDB)
|
||||||
|
|
||||||
|
@ -278,8 +281,7 @@ REFERENCES = \
|
||||||
System \
|
System \
|
||||||
System.Core \
|
System.Core \
|
||||||
System.Drawing \
|
System.Drawing \
|
||||||
System.Runtime.Serialization \
|
System.Runtime.Serialization
|
||||||
$(NPLOT_LIBS)
|
|
||||||
|
|
||||||
DLL_REFERENCES =
|
DLL_REFERENCES =
|
||||||
|
|
||||||
|
@ -298,7 +300,7 @@ NTP_ANALYZER_IMPORT_DLL = $(BUILD_DIR)/Ntp.Analyzer.Import.dll
|
||||||
|
|
||||||
$(eval $(call emit-deploy-target,MYSQL_DATA_DLL))
|
$(eval $(call emit-deploy-target,MYSQL_DATA_DLL))
|
||||||
$(eval $(call emit-deploy-target,NPGSQL_DLL))
|
$(eval $(call emit-deploy-target,NPGSQL_DLL))
|
||||||
|
$(eval $(call emit-deploy-target,NPLOT_DLL))
|
||||||
|
|
||||||
$(eval $(call emit_resgen_targets))
|
$(eval $(call emit_resgen_targets))
|
||||||
$(build_xamlg_list): %.xaml.g.cs: %.xaml
|
$(build_xamlg_list): %.xaml.g.cs: %.xaml
|
||||||
|
|
|
@ -5,12 +5,6 @@ AC_INIT([ntpa], [0.8.0])
|
||||||
AM_INIT_AUTOMAKE([foreign])
|
AM_INIT_AUTOMAKE([foreign])
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
|
|
||||||
dnl pkg-config
|
|
||||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
|
||||||
if test "x$PKG_CONFIG" = "xno"; then
|
|
||||||
AC_MSG_ERROR([You need to install pkg-config])
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
|
|
||||||
AC_PATH_PROG(MCS, mcs, no)
|
AC_PATH_PROG(MCS, mcs, no)
|
||||||
|
@ -39,9 +33,6 @@ if test -z "$CONFIG_REQUESTED" ; then
|
||||||
enable_release=yes
|
enable_release=yes
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl package checks,
|
|
||||||
PKG_CHECK_MODULES([NPLOT], [NPlot])
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
Ntp.Analyzer.Objects/Makefile
|
Ntp.Analyzer.Objects/Makefile
|
||||||
Ntp.Common/Makefile
|
Ntp.Common/Makefile
|
||||||
|
|
Loading…
Reference in New Issue