diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2019-11-07 11:24:22 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2019-11-07 11:26:12 +0300 |
| commit | c4864869ad50459c38dc1511cdd094fe476c7951 (patch) | |
| tree | b5fd20af8f309187d5f72325a250ad58c3523f10 /Makefile.am | |
| parent | 286727a60c8dc4b543709f0ece6aec958f65bbed (diff) | |
.......... [DEV-1348] converted go project to module packaging and moved go sources to src/ directory
* commit 'b3dcda5bf17675879b53557757994ed484f2c9ca':
.......... [DEV-1348] fixed rebase
.......... [DEV-1348] added zabbix_agent2 configuration file to gitignore
.......... [DEV-1348] added zabbix_agent2 binary to gitignore
.......... [DEV-1348] move agent2 sources form go/src to src/go
.......... [DEV-1348] removed redundat gopath from install target
.......... [DEV-1348] updated title message
.......... [DEV-1348] fixed agent2 build-time variables
.......... [DEV-1348] fixed agent2 conf file copying
.......... [DEV-1348] converted go structure to module pattern
(cherry picked from commit d66e357c1c8c943b4086f8f76d9ea061cd9ed73b)
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index fcefa8206a3..efdcd274082 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,18 +2,11 @@ ACLOCAL_AMFLAGS = -I m4 -if AGENT2 -AGENT2_SUBDIRS = \ - go -endif - - SUBDIRS = \ src \ database \ man \ - misc \ - $(AGENT2_SUBDIRS) + misc EXTRA_DIST = \ bin \ @@ -21,8 +14,7 @@ EXTRA_DIST = \ frontends \ include \ conf \ - sass \ - go + sass ## "dist-hook" run after the distribution directory is filled, but before the actual tar (or shar) file is created. dist-hook: @@ -55,9 +47,9 @@ dist-hook: $(top_distdir)/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java.new; \ mv $(top_distdir)/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java.new \ $(top_distdir)/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java; \ - cat $(top_distdir)/go/src/zabbix/pkg/version/version.go|sed "s/{ZABBIX_RC_NUM}/$$branch$$type_num$$type_count/g"| \ - sed "s/{ZABBIX_REVISION}/$$zabbix_revision/g" > $(top_distdir)/go/src/zabbix/pkg/version/version.go.new; \ - mv $(top_distdir)/go/src/zabbix/pkg/version/version.go.new $(top_distdir)/go/src/zabbix/pkg/version/version.go + cat $(top_distdir)/src/go/pkg/version/version.go|sed "s/{ZABBIX_RC_NUM}/$$branch$$type_num$$type_count/g"| \ + sed "s/{ZABBIX_REVISION}/$$zabbix_revision/g" > $(top_distdir)/src/go/pkg/version/version.go.new; \ + mv $(top_distdir)/src/go/pkg/version/version.go.new $(top_distdir)/src/go/pkg/version/version.go rm -rf `find $(top_distdir) -name ".gitignore" -o -name ".gitattributes"` rm -f $(top_distdir)/include/config.h |