Skip to content

Commit 6ad5db9

Browse files
committed
Merge pull request #30 from clusterpy/cleanupmake
Cleanup make
2 parents 8697223 + 6ea56d6 commit 6ad5db9

5 files changed

Lines changed: 9 additions & 533 deletions

File tree

Makefile

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,19 @@ TRANSLATIONS =
3131

3232
# global
3333

34-
PLUGINNAME = clusterpy_light
34+
PLUGINNAME = clusterpy_qgis_plugin
3535

36-
PY_FILES = clusterpy_light.py clusterpy_lightdialog.py __init__.py
36+
PY_FILES = clusterpy_light.py clusterpy_lightdialog.py __init__.py clusterpy.py plugin_utils.py workers.py
3737

38-
EXTRAS = uifiles/icon.png metadata.txt
38+
EXTRAS = metadata.txt
3939

40+
UI_FILESD = uifiles
41+
42+
# UI_FILES are the .py files created from .ui that will be removed on a clean
4043
UI_FILES = uifiles/ui_maxp.py uifiles/ui_about.py
4144

4245
RESOURCE_FILES = resources_rc.py
4346

44-
HELP = help/build/html
45-
4647
default: compile
4748

4849
compile: $(UI_FILES) $(RESOURCE_FILES)
@@ -56,17 +57,16 @@ compile: $(UI_FILES) $(RESOURCE_FILES)
5657
%.qm : %.ts
5758
lrelease $<
5859

59-
# The deploy target only works on unix like operating system where
60+
# The deploy target only works on unix like operating system where
6061
# the Python plugin directory is located at:
6162
# $HOME/$(QGISDIR)/python/plugins
62-
deploy: compile doc transcompile
63+
deploy: compile transcompile
6364
mkdir -p $(HOME)/$(QGISDIR)/python/plugins/$(PLUGINNAME)
6465
cp -vf $(PY_FILES) $(HOME)/$(QGISDIR)/python/plugins/$(PLUGINNAME)
65-
cp -vf $(UI_FILES) $(HOME)/$(QGISDIR)/python/plugins/$(PLUGINNAME)
66+
cp -vfr $(UI_FILESD) $(HOME)/$(QGISDIR)/python/plugins/$(PLUGINNAME)
6667
cp -vf $(RESOURCE_FILES) $(HOME)/$(QGISDIR)/python/plugins/$(PLUGINNAME)
6768
cp -vf $(EXTRAS) $(HOME)/$(QGISDIR)/python/plugins/$(PLUGINNAME)
6869
cp -vfr i18n $(HOME)/$(QGISDIR)/python/plugins/$(PLUGINNAME)
69-
cp -vfr $(HELP) $(HOME)/$(QGISDIR)/python/plugins/$(PLUGINNAME)/help
7070

7171
# The dclean target removes compiled python files from plugin directory
7272
# also delets any .svn entry
@@ -114,6 +114,3 @@ transclean:
114114
clean:
115115
rm $(UI_FILES) $(RESOURCE_FILES)
116116

117-
# build documentation with sphinx
118-
doc:
119-
cd help; make html

help/Makefile

Lines changed: 0 additions & 130 deletions
This file was deleted.

help/make.bat

Lines changed: 0 additions & 155 deletions
This file was deleted.

0 commit comments

Comments
 (0)