diff options
| author | David Drysdale <dmd@lurklurk.org> | 2013-07-18 13:20:29 +0100 |
|---|---|---|
| committer | David Drysdale <dmd@lurklurk.org> | 2013-07-18 13:20:29 +0100 |
| commit | c58a79d951fa81efe94a73b2b1a60ce841003ae4 (patch) | |
| tree | 7fe2362a78f91403ab4daf61abf1a0e963c63089 /tools/python/makefile | |
| parent | 1e00295106d6e08212ab7990a995b92055972590 (diff) | |
| parent | ec09bf779a26491add2bf76f8c12b1e047c5d84c (diff) | |
Merge branch 'dev' into python3
Conflicts:
python/phonenumbers/phonemetadata.py
python/phonenumbers/phonenumbermatcher.py
python/phonenumbers/phonenumberutil.py
python/tests/examplenumberstest.py
python/tests/phonenumbermatchertest.py
python/tests/phonenumberutiltest.py
python/tests/shortnumberutiltest.py
tools/python/makefile
Diffstat (limited to 'tools/python/makefile')
| -rw-r--r-- | tools/python/makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/python/makefile b/tools/python/makefile index d31975de..56f9e025 100644 --- a/tools/python/makefile +++ b/tools/python/makefile @@ -26,9 +26,11 @@ geodata: $(PYDIR)/phonenumbers/geodata/__init__.py $(PYDIR)/tests/testgeodata/__ # Generate Python files from metadata $(PYDIR)/phonenumbers/data/__init__.py: $(TOPDIR)/resources/PhoneNumberMetadata.xml $(TOPDIR)/resources/PhoneNumberAlternateFormats.xml buildmetadatafromxml.py $(PYTHON) buildmetadatafromxml.py --alt $(TOPDIR)/resources/PhoneNumberAlternateFormats.xml $(TOPDIR)/resources/PhoneNumberMetadata.xml $(PYDIR)/phonenumbers/data . +$(PYDIR)/phonenumbers/shortdata/__init__.py: $(TOPDIR)/resources/ShortNumberMetadata.xml buildmetadatafromxml.py + $(PYTHON) buildmetadatafromxml.py --short $(TOPDIR)/resources/ShortNumberMetadata.xml $(PYDIR)/phonenumbers/shortdata . $(PYDIR)/tests/testdata/__init__.py: $(TOPDIR)/resources/PhoneNumberMetadataForTesting.xml buildmetadatafromxml.py $(PYTHON) buildmetadatafromxml.py $(TOPDIR)/resources/PhoneNumberMetadataForTesting.xml $(PYDIR)/tests/testdata phonenumbers -metadata: $(PYDIR)/phonenumbers/data/__init__.py $(PYDIR)/tests/testdata/__init__.py geodata +metadata: $(PYDIR)/phonenumbers/data/__init__.py $(PYDIR)/phonenumbers/shortdata/__init__.py $(PYDIR)/tests/testdata/__init__.py geodata alldata: metadata geodata locale @@ -82,7 +84,7 @@ clean: coverage_clean profile_clean rm -rf $(PYDIR)/build $(PYDIR)/deb_dist $(PYDIR)/dist metaclean: - rm -rf $(PYDIR)/phonenumbers/data $(PYDIR)/tests/testdata + rm -rf $(PYDIR)/phonenumbers/data $(PYDIR)/phonenumbers/shortdata $(PYDIR)/tests/testdata rm -rf $(PYDIR)/phonenumbers/geodata $(PYDIR)/tests/testgeodata distclean: clean metaclean |