diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:27:57 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:27:57 +0200 |
| commit | 5012e466ce473b27b4ff6dbfab53a6c97a4041ca (patch) | |
| tree | 1430faa05e0e2b2fedda8022561cfbc15a6b74f8 /scp2/util | |
| parent | 6f0156d40c3f8269d9fd6410f614755dc1bb14f4 (diff) | |
| parent | 649a3a418160979179ccdfd997edb8dbf83a6d25 (diff) | |
resyncing to master
Diffstat (limited to 'scp2/util')
| -rw-r--r-- | scp2/util/makefile.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index af4861d10e1d..ff2037fa59ec 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -206,15 +206,18 @@ SCP1FILES += \ SCP1FILES += \ vclcanvas.par \ -.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE" +.IF "$(GUI)"=="UNX" +#X11 MacOSX has no cairo-canvas +.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua" SCP1FILES += cairocanvas.par .ENDIF +.ENDIF .IF "$(ENABLE_LAYOUT)" == "TRUE" SCP1FILES += layout.par .ENDIF # ENABLE_LAYOUT == TRUE -.IF "$(BUILD_SPECIAL)"!="" +.IF "$(ENABLE_ONLINE_UPDATE)"!="" SCP1FILES += \ module_onlineupdate.par \ file_onlineupdate.par @@ -391,7 +394,7 @@ SCP2FILES += \ SCP2FILES += layout.par .ENDIF # ENABLE_LAYOUT == TRUE -.IF "$(BUILD_SPECIAL)"!="" +.IF "$(ENABLE_ONLINE_UPDATE)"!="" SCP2FILES += \ module_onlineupdate.par \ file_onlineupdate.par |