diff options
37 files changed, 0 insertions, 77 deletions
diff --git a/config/src/.gitignore b/config/src/.gitignore index 528c8f7183d..2e8e6fd906a 100644 --- a/config/src/.gitignore +++ b/config/src/.gitignore @@ -1,4 +1,3 @@ /Makefile.ini -/config.mak /config_command.sh /project.dsw diff --git a/configd/src/.gitignore b/configd/src/.gitignore index 2129b57c8a4..a39df0815b3 100644 --- a/configd/src/.gitignore +++ b/configd/src/.gitignore @@ -1,4 +1,3 @@ Makefile.ini config_command.sh -configd.mak project.dsw diff --git a/configdefinitions/src/.gitignore b/configdefinitions/src/.gitignore index 02d2647f806..a39df0815b3 100644 --- a/configdefinitions/src/.gitignore +++ b/configdefinitions/src/.gitignore @@ -1,4 +1,3 @@ Makefile.ini config_command.sh -configdefinitions.mak project.dsw diff --git a/configutil/src/.gitignore b/configutil/src/.gitignore index f7e40c87b26..2e8e6fd906a 100644 --- a/configutil/src/.gitignore +++ b/configutil/src/.gitignore @@ -1,4 +1,3 @@ /Makefile.ini /config_command.sh -/configutil.mak /project.dsw diff --git a/defaults/src/.gitignore b/defaults/src/.gitignore index 3e338e617f9..d4590f3a58c 100644 --- a/defaults/src/.gitignore +++ b/defaults/src/.gitignore @@ -1,3 +1,2 @@ Makefile.ini config_command.sh -defaults.mak diff --git a/document/src/.gitignore b/document/src/.gitignore index 12cd838c514..a39df0815b3 100644 --- a/document/src/.gitignore +++ b/document/src/.gitignore @@ -1,4 +1,3 @@ Makefile.ini config_command.sh -document.mak project.dsw diff --git a/documentapi/src/.gitignore b/documentapi/src/.gitignore index afa6b2d43c5..a39df0815b3 100644 --- a/documentapi/src/.gitignore +++ b/documentapi/src/.gitignore @@ -1,4 +1,3 @@ Makefile.ini config_command.sh -documentapi.mak project.dsw diff --git a/fastlib/src/.gitignore b/fastlib/src/.gitignore index b5b26fa8473..9d5b23b7747 100644 --- a/fastlib/src/.gitignore +++ b/fastlib/src/.gitignore @@ -6,5 +6,4 @@ Makefile.ini config_command.bat config_command.sh -fastlib.mak output diff --git a/fastos/src/.gitignore b/fastos/src/.gitignore index 87807fb815c..2e8e6fd906a 100644 --- a/fastos/src/.gitignore +++ b/fastos/src/.gitignore @@ -1,4 +1,3 @@ /Makefile.ini /config_command.sh -/fastos.mak /project.dsw diff --git a/fnet/src/.gitignore b/fnet/src/.gitignore index 516a0a876bc..7bf7b0038f0 100644 --- a/fnet/src/.gitignore +++ b/fnet/src/.gitignore @@ -1,7 +1,6 @@ *.dsp Makefile.ini config_command.sh -fnet.mak project.dsw xsync.log /gen diff --git a/fsa/src/.gitignore b/fsa/src/.gitignore index 65ad4d24f75..b4cda6d3af4 100644 --- a/fsa/src/.gitignore +++ b/fsa/src/.gitignore @@ -3,4 +3,3 @@ test.out /Makefile.ini /config_command.sh -/fsa.mak diff --git a/juniper/.gitignore b/juniper/.gitignore index 0c9cc229d0e..a106509440d 100644 --- a/juniper/.gitignore +++ b/juniper/.gitignore @@ -2,7 +2,6 @@ Makefile.ini config_command.sh include -juniper.mak lib project.dsw Makefile diff --git a/messagebus/src/.gitignore b/messagebus/src/.gitignore index 3b9f1ee8e62..7752884b41f 100644 --- a/messagebus/src/.gitignore +++ b/messagebus/src/.gitignore @@ -1,5 +1,4 @@ Makefile.ini config_command.sh doxygen -messagebus.mak project.dsw diff --git a/messagebus_test/src/.gitignore b/messagebus_test/src/.gitignore index 8689bfd3624..40fd3439da1 100644 --- a/messagebus_test/src/.gitignore +++ b/messagebus_test/src/.gitignore @@ -4,5 +4,3 @@ config.cfg config_command.sh configure project.dsw -versiontag.mak -/messagebus_test.mak diff --git a/metrics/src/.gitignore b/metrics/src/.gitignore index 698739d7bbc..a39df0815b3 100644 --- a/metrics/src/.gitignore +++ b/metrics/src/.gitignore @@ -1,4 +1,3 @@ Makefile.ini config_command.sh project.dsw -/metrics.mak diff --git a/persistence/src/.gitignore b/persistence/src/.gitignore index ea5bfd4b499..2e8e6fd906a 100644 --- a/persistence/src/.gitignore +++ b/persistence/src/.gitignore @@ -1,4 +1,3 @@ /Makefile.ini /config_command.sh /project.dsw -/persistence.mak diff --git a/persistencetypes/src/.gitignore b/persistencetypes/src/.gitignore index b17e583dfac..2e8e6fd906a 100644 --- a/persistencetypes/src/.gitignore +++ b/persistencetypes/src/.gitignore @@ -1,4 +1,3 @@ /Makefile.ini /config_command.sh -/persistencetypes.mak /project.dsw diff --git a/searchcommon/src/.gitignore b/searchcommon/src/.gitignore index 8b68901f2ce..2e8e6fd906a 100644 --- a/searchcommon/src/.gitignore +++ b/searchcommon/src/.gitignore @@ -1,4 +1,3 @@ /Makefile.ini /config_command.sh /project.dsw -/searchcommon.mak diff --git a/searchcore/src/versiontag.mak b/searchcore/src/versiontag.mak deleted file mode 100644 index 3f8d09a48e0..00000000000 --- a/searchcore/src/versiontag.mak +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -VTAG_DATE=$(shell date +%Y.%m.%d-%H.%M.%S) -VTAG_SYSTEM=$(shell uname -s) -VTAG_SYSTEM_REV=$(shell uname -r) -VTAG_BUILDER=$(shell (whoami) 2>/dev/null||logname)@$(shell uname -n) -ifneq (X$(SPECIFIED_VTAG),XDISABLE) - ifeq (X$(UNAME), XWin32) - VTAG=-DV_TAG='\"$(SPECIFIED_VTAG)\"' - else - VTAG=-DV_TAG='"$(SPECIFIED_VTAG)"' - endif -else - ifeq (X$(UNAME), XWin32) - VTAG= - else - VTAG_TAG=$(shell cat $(TOP)/CVS/Tag 2>/dev/null | sed "s/^.//" 2>/dev/null) - ifeq (X$(VTAG_TAG),X) - VTAG_TAG=CURRENT - endif - ifeq ($(findstring _RELEASE, $(VTAG_TAG)),_RELEASE) - VTAG_SYSTEM=$(shell uname -s) - VTAG=-DV_TAG='"$(VTAG_TAG)-$(VTAG_SYSTEM)"' - else - VTAG_DATE=$(shell date +%Y.%m.%d-%H:%M:%S) - VTAG_SYSTEM=$(shell (whoami) 2>/dev/null||logname)@$(shell uname -n)-$(shell uname -s)-$(shell uname -r) - VTAG=-DV_TAG='"$(VTAG_TAG)-$(VTAG_SYSTEM)-$(VTAG_DATE)"' - endif - endif -endif -VTAG+= -DV_TAG_DATE='"$(VTAG_DATE)"' -VTAG+= -DV_TAG_SYSTEM='"$(VTAG_SYSTEM)"' -VTAG+= -DV_TAG_SYSTEM_REV='"$(VTAG_SYSTEM_REV)"' -VTAG+= -DV_TAG_BUILDER='"$(VTAG_BUILDER)"' - diff --git a/searchcorespi/src/.gitignore b/searchcorespi/src/.gitignore index 49bfd9b85d3..2e8e6fd906a 100644 --- a/searchcorespi/src/.gitignore +++ b/searchcorespi/src/.gitignore @@ -1,4 +1,3 @@ /Makefile.ini /config_command.sh /project.dsw -/searchcorespi.mak diff --git a/searchlib/src/.gitignore b/searchlib/src/.gitignore index 3e2fb17989e..b7456dab392 100644 --- a/searchlib/src/.gitignore +++ b/searchlib/src/.gitignore @@ -1,5 +1,4 @@ *.dsp -*.mak Makefile.ini config_command.sh html diff --git a/searchsummary/src/.gitignore b/searchsummary/src/.gitignore index 47011ff3508..2e8e6fd906a 100644 --- a/searchsummary/src/.gitignore +++ b/searchsummary/src/.gitignore @@ -1,4 +1,3 @@ /Makefile.ini /config_command.sh /project.dsw -/searchsummary.mak diff --git a/slobrok/src/.gitignore b/slobrok/src/.gitignore index 42d192f90a7..a39df0815b3 100644 --- a/slobrok/src/.gitignore +++ b/slobrok/src/.gitignore @@ -1,4 +1,3 @@ Makefile.ini config_command.sh project.dsw -/slobrok.mak diff --git a/staging_vespalib/src/.gitignore b/staging_vespalib/src/.gitignore index eadbd940e1c..7871665637b 100644 --- a/staging_vespalib/src/.gitignore +++ b/staging_vespalib/src/.gitignore @@ -1,5 +1,4 @@ *.dsp -*.mak Makefile.ini config_command.sh project.dsw diff --git a/storage/src/.gitignore b/storage/src/.gitignore index f7cecb195ca..4bb2c3395eb 100644 --- a/storage/src/.gitignore +++ b/storage/src/.gitignore @@ -7,4 +7,3 @@ Makefile.ini config_command.sh project.dsw -/storage.mak diff --git a/storage/src/versiontag.mak b/storage/src/versiontag.mak deleted file mode 100644 index b01f54a9446..00000000000 --- a/storage/src/versiontag.mak +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -VTAG := $(shell $(VESPALIB_DIR)/bin/getversion -D $(TOP) ) - -ifneq (X$(SPECIFIED_VTAG),XDISABLE) - VTAG += -DV_TAG='"$(SPECIFIED_VTAG)"' -endif diff --git a/storageapi/src/.gitignore b/storageapi/src/.gitignore index 3578c0b3853..a735fdb4395 100644 --- a/storageapi/src/.gitignore +++ b/storageapi/src/.gitignore @@ -3,4 +3,3 @@ Makefile.ini config_command.sh doc project.dsw -/storageapi.mak diff --git a/storageframework/src/.gitignore b/storageframework/src/.gitignore index 57b38cc4f9d..2e8e6fd906a 100644 --- a/storageframework/src/.gitignore +++ b/storageframework/src/.gitignore @@ -1,4 +1,3 @@ /Makefile.ini /config_command.sh /project.dsw -/storageframework.mak diff --git a/storageserver/src/.gitignore b/storageserver/src/.gitignore index 9669be96e4b..4bb2c3395eb 100644 --- a/storageserver/src/.gitignore +++ b/storageserver/src/.gitignore @@ -7,4 +7,3 @@ Makefile.ini config_command.sh project.dsw -/storageserver.mak diff --git a/streamingvisitors/src/.gitignore b/streamingvisitors/src/.gitignore index f7611c3f5a8..a735fdb4395 100644 --- a/streamingvisitors/src/.gitignore +++ b/streamingvisitors/src/.gitignore @@ -3,4 +3,3 @@ Makefile.ini config_command.sh doc project.dsw -/streamingvisitors.mak diff --git a/vbench/src/.gitignore b/vbench/src/.gitignore index 7466c45681b..180d0ec5ea6 100644 --- a/vbench/src/.gitignore +++ b/vbench/src/.gitignore @@ -1,4 +1,3 @@ /Makefile.ini /project.dsw /config_command.sh -/vbench.mak diff --git a/vdslib/src/.gitignore b/vdslib/src/.gitignore index 1ba69e012b7..a39df0815b3 100644 --- a/vdslib/src/.gitignore +++ b/vdslib/src/.gitignore @@ -1,4 +1,3 @@ Makefile.ini config_command.sh project.dsw -/vdslib.mak diff --git a/vdstestlib/src/.gitignore b/vdstestlib/src/.gitignore index 201bafb341f..2e8e6fd906a 100644 --- a/vdstestlib/src/.gitignore +++ b/vdstestlib/src/.gitignore @@ -1,4 +1,3 @@ /Makefile.ini /config_command.sh /project.dsw -/vdstestlib.mak diff --git a/vespalib/src/.gitignore b/vespalib/src/.gitignore index 8859e7233e9..d185ea18fd0 100644 --- a/vespalib/src/.gitignore +++ b/vespalib/src/.gitignore @@ -1,5 +1,4 @@ *.dsp -*.mak Makefile.ini config_command.sh project.dsw diff --git a/vespalog/src/.gitignore b/vespalog/src/.gitignore index 41357d5435e..e03155ca194 100644 --- a/vespalog/src/.gitignore +++ b/vespalog/src/.gitignore @@ -1,5 +1,4 @@ Makefile.ini config.h config_command.sh -vespalog.mak project.dsw diff --git a/vespamalloc/src/.gitignore b/vespamalloc/src/.gitignore index dd21c2da121..a39df0815b3 100644 --- a/vespamalloc/src/.gitignore +++ b/vespamalloc/src/.gitignore @@ -1,4 +1,3 @@ Makefile.ini config_command.sh project.dsw -vespamalloc.mak diff --git a/vsm/src/.gitignore b/vsm/src/.gitignore index 8859e7233e9..d185ea18fd0 100644 --- a/vsm/src/.gitignore +++ b/vsm/src/.gitignore @@ -1,5 +1,4 @@ *.dsp -*.mak Makefile.ini config_command.sh project.dsw |