diff --git a/android/.externalToolBuilders/make libs.launch b/android/.externalToolBuilders/make libs.launch
index 8bd4718e28..50fbe30059 100644
--- a/android/.externalToolBuilders/make libs.launch	
+++ b/android/.externalToolBuilders/make libs.launch	
@@ -6,7 +6,7 @@
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/make"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="libs NODEPS=''"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="libs NODEPS=1"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Rockbox}"/>
 </launchConfiguration>
diff --git a/android/android.make b/android/android.make
index 583d468472..246cd88f02 100644
--- a/android/android.make
+++ b/android/android.make
@@ -147,7 +147,7 @@ $(KEYSTORE):
 		-sigalg MD5withRSA -keyalg RSA -keysize 1024 \
 		-dname "CN=Android Debug,O=Android,C=US"
 
-ifdef NODEPS
+ifneq ($(NODEPS),,)
 $(APK): $(TEMP_APK) $(KEYSTORE)
 else
 $(APK): $(TEMP_APK) $(BUILDDIR)/rockbox.zip $(KEYSTORE)
diff --git a/tools/root.make b/tools/root.make
index 4a3cec8a36..48e3017906 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -320,10 +320,12 @@ tar: $(BUILDDIR)/rockbox.tar
 
 fontzip: BUILDZIPOPTS=-f 1
 fontzip: ZIPFILESUFFIX=-fonts
+fontzip: NODEPS=1
 fontzip: zip
 
 font7zip: BUILDZIPOPTS=-f 1
 font7zip: ZIPFILESUFFIX=-fonts
+font7zip: NODEPS=1
 font7zip: 7zip
 
 fullzip: BUILDZIPOPTS=-f 2
@@ -338,7 +340,7 @@ fulltar: BUILDZIPOPTS=-f 2
 fulltar: ZIPFILESUFFIX=-full
 fulltar: tar
 
-ifdef NODEPS
+ifneq ($(NODEPS),,)
 $(BUILDDIR)/rockbox.zip:
 else
 $(BUILDDIR)/rockbox.zip: build
@@ -352,7 +354,7 @@ mapzip:
 elfzip:
 	$(SILENT)find . -name "*.elf" | xargs zip rockbox-elfs.zip
 
-ifdef NODEPS
+ifneq ($(NODEPS),,)
 $(BUILDDIR)/rockbox.7z:
 else
 $(BUILDDIR)/rockbox.7z: build
@@ -360,7 +362,7 @@ endif
 	$(call PRINTS,7Z rockbox$(ZIPFILESUFFIX).7z)
 	$(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\"  -o $(BUILDDIR)/rockbox$(ZIPFILESUFFIX).7z  -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(BUILDZIPOPTS) $(TARGET) $(BINARY)
 
-ifdef NODEPS
+ifneq ($(NODEPS),,)
 $(BUILDDIR)/rockbox.tar:
 else
 $(BUILDDIR)/rockbox.tar: build