diff --git a/make/doxygen.mk b/make/doxygen.mk
index 98f4fe7e..5157d26e 100644
--- a/make/doxygen.mk
+++ b/make/doxygen.mk
@@ -10,24 +10,24 @@ ifneq ($(GENERATE_DOXYGEN),true)
 include $(MODDIR)/make/dummy.mk
 else
 
-UPLOAD_FILE_MODE      ?= 644
-UPLOAD_DIR_MODE       ?= 755
+UPLOAD_FILE_MODE            ?= 644
+UPLOAD_DIR_MODE             ?= 755
 
 include $(MODDIR)/make/upload-defs.mk
 
-UPLOAD_URL                  ?= $(UPLOAD_URL_DEVEL_DOC)/$(PROJECT)/doxygen/:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP)
-UNTEMPLATED                  = $(patsubst %.tmpl,%,$(wildcard *.tmpl))
-OUTPUT_DIR                  ?= html
-INSTALL_DOXYGEN_DIR         ?= $(DOC_PREFIX)/devel
-DOC_FILES                    = $(IMAGEDIR)/jannet_08.png
-DOXYGEN_CONF                ?= doxygen.conf
+UPLOAD_URL              ?= $(UPLOAD_URL_DEVEL_DOC)/$(PROJECT)/doxygen/:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP)
+DX_UNTEMPLATED           = $(patsubst %.tmpl,%,$(wildcard *.tmpl))
+DX_OUTPUT_DIR           ?= html
+DX_INSTALL_DIR          ?= $(DOC_PREFIX)/devel
+DX_DOC_FILES             = $(IMAGEDIR)/jannet_08.png
+DX_DOXYGEN_CONF         ?= doxygen.conf
 
 # replaced pattern defaults
-DOC_FILE_PATTERNS           ?= *.h
-DOC_INPUT_DIRS              ?= $(TOPDIR)/include
-DOC_SRC_IS_JAVA             ?= NO
-DOC_EXCLUDE_FILES           ?= 
-DOC_INCLUDE_PATH            ?= 
+DX_FILE_PATTERNS        ?= *.h
+DX_INPUT_DIRS           ?= $(TOPDIR)/include
+DX_SRC_IS_JAVA          ?= NO
+DX_EXCLUDE_FILES        ?= 
+DX_INCLUDE_PATH         ?= 
 
 all: html
 install: install.done
@@ -44,37 +44,37 @@ html: doxygen.done cpfiles.done
 		s/__VERSION__/$(DIST_VERSION)/; \
 		s/__PROJECT__/$(PROJECT)/; \
 		s/__PROJECT_CAPNAME__/$(PROJECT_CAPNAME)/; \
-		s/__OUTPUT_DIR__/$(OUTPUT_DIR)/; \
+		s/__OUTPUT_DIR__/$(DX_OUTPUT_DIR)/; \
 		s%__PROJECT_TOPDIR__%$(TOPDIR)%; \
-		s%__FILE_PATTERNS__%$(DOC_FILE_PATTERNS)%; \
-		s%__INPUT_DIRS__%$(DOC_INPUT_DIRS)%; \
-		s%__SRC_IS_JAVA__%$(DOC_SRC_IS_JAVA)%; \
-		s%__EXCLUDE_FILES__%$(DOC_EXCLUDE_FILES)%; \
-		s%__INCLUDE_PATH__%$(DOC_INCLUDE_PATH)%; \
+		s%__FILE_PATTERNS__%$(DX_FILE_PATTERNS)%; \
+		s%__INPUT_DIRS__%$(DX_INPUT_DIRS)%; \
+		s%__SRC_IS_JAVA__%$(DX_SRC_IS_JAVA)%; \
+		s%__EXCLUDE_FILES__%$(DX_EXCLUDE_FILES)%; \
+		s%__INCLUDE_PATH__%$(DX_INCLUDE_PATH)%; \
 	" $< > $@
 
-doxygen.done: $(UNTEMPLATED)
-	umask 022; doxygen $(DOXYGEN_CONF)
+doxygen.done: $(DX_UNTEMPLATED)
+	umask 022; doxygen $(DX_DOXYGEN_CONF)
 	touch $@
 
-cpfiles.done: doxygen.done $(DOC_FILES) 
-	umask 022; cp $(DOC_FILES) $(OUTPUT_DIR)
+cpfiles.done: doxygen.done $(DX_DOC_FILES) 
+	umask 022; cp $(DX_DOC_FILES) $(DX_OUTPUT_DIR)
 	touch $@
 
 doc.done: doxygen.done cpfiles.done
 	touch $@
 
 view: doc.done
-	konqueror $(OUTPUT_DIR)/index.html
+	konqueror $(DX_OUTPUT_DIR)/index.html
 
 upload.done: doxygen.done cpfiles.done
-	upload.sh $(OUTPUT_DIR)/ $(UPLOAD_URL)
+	upload.sh $(DX_OUTPUT_DIR)/ $(UPLOAD_URL)
 
 clean.doxygen:
-	rm -rf $(OUTPUT_DIR) *.done $(UNTEMPLATED)
+	rm -rf $(DX_OUTPUT_DIR) *.done $(DX_UNTEMPLATED)
 
 inst-dir.done:
-	$(INSTALL) -d -o $(DOCDIROWNER) -g $(DOCDIRGROUP) -m $(DOCDIRMODE) $(INSTALL_DOXYGEN_DIR)
+	$(INSTALL) -d -o $(DOCDIROWNER) -g $(DOCDIRGROUP) -m $(DOCDIRMODE) $(DX_INSTALL_DIR)
 	touch $@
 	
 install.done: doxygen.done inst-dir.done
@@ -83,10 +83,10 @@ install.done: doxygen.done inst-dir.done
 
 install.doxygen:
 	$(INSTALL) -o $(DOCOWNER) -g $(DOCGROUP) -m $(DOCMODE) \
-		$(wildcard $(OUTPUT_DIR)/*.html) \
-		$(wildcard $(OUTPUT_DIR)/*.gif) \
-		$(wildcard $(OUTPUT_DIR)/*.png) \
-		$(wildcard $(OUTPUT_DIR)/*.css) \
-		$(INSTALL_DOXYGEN_DIR)
+		$(wildcard $(DX_OUTPUT_DIR)/*.html) \
+		$(wildcard $(DX_OUTPUT_DIR)/*.gif) \
+		$(wildcard $(DX_OUTPUT_DIR)/*.png) \
+		$(wildcard $(DX_OUTPUT_DIR)/*.css) \
+		$(DX_INSTALL_DIR)
 endif