summaryrefslogtreecommitdiffstats
path: root/addon
diff options
context:
space:
mode:
Diffstat (limited to 'addon')
-rw-r--r--addon/doxmlparser/examples/metrics/metrics.pro.in16
-rw-r--r--addon/doxmlparser/src/doxmlparser.pro.in4
-rw-r--r--addon/doxmlparser/test/xmlparse.pro.in14
-rw-r--r--addon/doxyapp/doxyapp.pro.in2
-rw-r--r--addon/doxysearch/doxyindexer.pro.in2
-rw-r--r--addon/doxysearch/doxysearch.pro.in2
-rw-r--r--addon/doxywizard/Makefile.in4
-rw-r--r--addon/doxywizard/doxywizard.pro.in20
-rw-r--r--addon/doxywizard/expert.cpp2
9 files changed, 33 insertions, 33 deletions
diff --git a/addon/doxmlparser/examples/metrics/metrics.pro.in b/addon/doxmlparser/examples/metrics/metrics.pro.in
index 6dd344f..3b2354d 100644
--- a/addon/doxmlparser/examples/metrics/metrics.pro.in
+++ b/addon/doxmlparser/examples/metrics/metrics.pro.in
@@ -2,19 +2,19 @@ TEMPLATE = app.t
CONFIG = console warn_on $extraopts
HEADERS =
SOURCES = main.cpp
-unix:LIBS += -L../../../../lib -L../../lib -ldoxmlparser -lqtools
+unix:LIBS += -L../../../../lib -ldoxmlparser -lqtools
win32:INCLUDEPATH += .
-win32-mingw:LIBS += -L../../../../lib -L../../lib -ldoxmlparser -lqtools
+win32-mingw:LIBS += -L../../../../lib -ldoxmlparser -lqtools
win32-msvc:LIBS += doxmlparser.lib qtools.lib shell32.lib
-win32-msvc:TMAKE_LFLAGS += /LIBPATH:..\..\..\..\lib;..\..\lib
+win32-msvc:TMAKE_LFLAGS += /LIBPATH:..\..\..\..\lib;
win32-borland:LIBS += doxmlparser.lib qtools.lib shell32.lib
-win32-borland:TMAKE_LFLAGS += -L..\..\..\..\lib -L..\..\lib
+win32-borland:TMAKE_LFLAGS += -L..\..\..\..\lib
win32:TMAKE_CXXFLAGS += -DQT_NODLL
-DESTDIR =
-OBJECTS_DIR = obj
+DESTDIR = ../../../../bin
+OBJECTS_DIR = ../../../../objects/doxmlparer/metrics
TARGET = metrics
DEPENDPATH = ../../include
INCLUDEPATH += ../../../../qtools ../../include
-unix:TARGETDEPS = ../../lib/libdoxmlparser.a
-win32:TARGETDEPS = ..\..\lib\doxmlparser.lib
+unix:TARGETDEPS = ../../../../lib/libdoxmlparser.a
+win32:TARGETDEPS = ..\..\..\..\lib\doxmlparser.lib
diff --git a/addon/doxmlparser/src/doxmlparser.pro.in b/addon/doxmlparser/src/doxmlparser.pro.in
index 841a46c..2bbf326 100644
--- a/addon/doxmlparser/src/doxmlparser.pro.in
+++ b/addon/doxmlparser/src/doxmlparser.pro.in
@@ -20,8 +20,8 @@ win32-msvc:TMAKE_LFLAGS += /LIBPATH:....\\..\lib
win32-borland:LIBS += qtools.lib doxycfg.lib shell32.lib
win32-borland:TMAKE_LFLAGS += -L..\..\..\lib
win32:TMAKE_CXXFLAGS += -DQT_NODLL
-DESTDIR = ../lib
-OBJECTS_DIR = ../objects
+DESTDIR = ../../../lib
+OBJECTS_DIR = ../../../objects/doxmlparser
TARGET = doxmlparser
INCLUDEPATH += ../../../qtools ../include
diff --git a/addon/doxmlparser/test/xmlparse.pro.in b/addon/doxmlparser/test/xmlparse.pro.in
index cfb95be..368d499 100644
--- a/addon/doxmlparser/test/xmlparse.pro.in
+++ b/addon/doxmlparser/test/xmlparse.pro.in
@@ -2,19 +2,19 @@ TEMPLATE = app.t
CONFIG = console warn_on $extraopts
HEADERS =
SOURCES = main.cpp
-unix:LIBS += -L../../../lib -L../lib -ldoxmlparser -lqtools
+unix:LIBS += -L../../../lib -ldoxmlparser -lqtools
win32:INCLUDEPATH += .
-win32-mingw:LIBS += -L../../../lib -L../lib -ldoxmlparser -lqtools
+win32-mingw:LIBS += -L../../../lib -ldoxmlparser -lqtools
win32-msvc:LIBS += doxmlparser.lib qtools.lib shell32.lib
win32-msvc:TMAKE_LFLAGS += /LIBPATH:..\..\..\lib;..\lib
win32-borland:LIBS += doxmlparser.lib qtools.lib shell32.lib
-win32-borland:TMAKE_LFLAGS += -L..\..\..\lib -L..\lib
+win32-borland:TMAKE_LFLAGS += -L..\..\..\lib
win32:TMAKE_CXXFLAGS += -DQT_NODLL
-DESTDIR =
-OBJECTS_DIR = ../objects
+DESTDIR = ../../../bin
+OBJECTS_DIR = ../../../objects/doxmlparser/test
TARGET = xmlparse
INCLUDEPATH += ../../../qtools ../include
DEPENDPATH += ../include
-unix:TARGETDEPS = ../lib/libdoxmlparser.a
-win32:TARGETDEPS = ..\lib\doxmlparser.lib
+unix:TARGETDEPS = ../../../lib/libdoxmlparser.a
+win32:TARGETDEPS = ..\..\..\lib\doxmlparser.lib
diff --git a/addon/doxyapp/doxyapp.pro.in b/addon/doxyapp/doxyapp.pro.in
index 4a49a56..7a8c5ee 100644
--- a/addon/doxyapp/doxyapp.pro.in
+++ b/addon/doxyapp/doxyapp.pro.in
@@ -4,7 +4,7 @@ HEADERS =
SOURCES = doxyapp.cpp
LIBS += -L../../lib -ldoxygen -lqtools -lmd5 -ldoxycfg -lpthread -liconv
DESTDIR =
-OBJECTS_DIR = ../../objects
+OBJECTS_DIR = ../../objects/doxyapp
TARGET = ../../bin/doxyapp
INCLUDEPATH += ../../qtools ../../src
DEPENDPATH += ../../src
diff --git a/addon/doxysearch/doxyindexer.pro.in b/addon/doxysearch/doxyindexer.pro.in
index deeb8f8..c84a2ac 100644
--- a/addon/doxysearch/doxyindexer.pro.in
+++ b/addon/doxysearch/doxyindexer.pro.in
@@ -4,7 +4,7 @@ HEADERS =
SOURCES = doxyindexer.cpp
LIBS += -L../../lib -lxapian -lqtools
DESTDIR =
-OBJECTS_DIR = ../../objects
+OBJECTS_DIR = ../../objects/doxyindexer
TARGET = ../../bin/doxyindexer
INCLUDEPATH += ../../qtools
DEPENDPATH +=
diff --git a/addon/doxysearch/doxysearch.pro.in b/addon/doxysearch/doxysearch.pro.in
index c860fd1..702f5a4 100644
--- a/addon/doxysearch/doxysearch.pro.in
+++ b/addon/doxysearch/doxysearch.pro.in
@@ -4,7 +4,7 @@ HEADERS =
SOURCES = doxysearch.cpp
LIBS += -lxapian
DESTDIR =
-OBJECTS_DIR = ../../objects
+OBJECTS_DIR = ../../objects/doxysearch
TARGET = ../../bin/doxysearch.cgi
INCLUDEPATH +=
DEPENDPATH +=
diff --git a/addon/doxywizard/Makefile.in b/addon/doxywizard/Makefile.in
index 152c2b7..8cafb9e 100644
--- a/addon/doxywizard/Makefile.in
+++ b/addon/doxywizard/Makefile.in
@@ -30,8 +30,8 @@ distclean: Makefile.doxywizard
$(RM) Makefile.doxywizard
realclean: Makefile.doxywizard
- $(RM) configdoc.cpp
- $(RM) config_doxyw.cpp
+ $(RM) ../../generated_src/doxywizard/configdoc.cpp
+ $(RM) ../../generated_src/doxywizard/config_doxyw.cpp
$(MAKE) distclean
install:
diff --git a/addon/doxywizard/doxywizard.pro.in b/addon/doxywizard/doxywizard.pro.in
index 01832df..0c8d049 100644
--- a/addon/doxywizard/doxywizard.pro.in
+++ b/addon/doxywizard/doxywizard.pro.in
@@ -6,12 +6,12 @@ TEMPLATE = app
DESTDIR = ../../bin
TARGET =
DEPENDPATH += .
-INCLUDEPATH += .
+INCLUDEPATH += . ../../generated_src/doxywizard
QT += xml
CONFIG += $extraopts
-OBJECTS_DIR = obj
-MOC_DIR = moc
-RCC_DIR = rcc
+OBJECTS_DIR = ../../objects/doxywizard
+MOC_DIR = ../../moc/doxywizard
+RCC_DIR = ../../rcc/doxywizard
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
macx-g++ {
@@ -27,13 +27,13 @@ RESOURCES += doxywizard.qrc
INCBUFSIZE=$(PYTHON) ../../src/increasebuffer.py
win32:RC_FILE += doxywizard.rc
-config.target = config_doxyw.cpp
-config.commands = $(LEX) -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
-config.depends = config_doxyw.l ../../src/increasebuffer.py
-configdoc.target = configdoc.cpp
-configdoc.commands = $(PYTHON) ../../src/configgen.py -wiz ../../src/config.xml > configdoc.cpp
+config.target = ../../generated_src/doxywizard/config_doxyw.cpp
+config.commands = $(LEX) -Pconfig_doxywYY -t ../../addon/doxywizard/config_doxyw.l | $(INCBUFSIZE) >../../generated_src/doxywizard/$*.cpp
+config.depends = ../../addon/doxywizard/config_doxyw.l ../../src/increasebuffer.py
+configdoc.target = ../../generated_src/doxywizard/configdoc.cpp
+configdoc.commands = $(PYTHON) ../../src/configgen.py -wiz ../../src/config.xml > ../../generated_src/doxywizard/configdoc.cpp
configdoc.depends = ../../src/config.xml ../../src/configgen.py
-version.target = ../../src/version.cpp
+version.target = ../../generated_src/doxywizard/version.cpp
version.commands = cd ../../src;$(PYTHON) version.py
version.depends = ../../configure
QMAKE_EXTRA_TARGETS += configdoc config version
diff --git a/addon/doxywizard/expert.cpp b/addon/doxywizard/expert.cpp
index 4c988c9..155498c 100644
--- a/addon/doxywizard/expert.cpp
+++ b/addon/doxywizard/expert.cpp
@@ -9,7 +9,7 @@
#include "config.h"
#include "version.h"
#include "configdoc.h"
-#include "../../src/settings.h"
+#include "settings.h"
#define SA(x) QString::fromAscii(x)
generated by cgit v0.12 at 2024-07-01 10:01:07 (GMT)