From ecdfe066e8c84f5f2331482d8f44270f47753135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Tue, 28 Feb 2012 08:44:34 +0000
Subject: [PATCH] create win-dlls; refs #115

---
 src/designer/makefile.am     | 2 +-
 src/designer/qmake.pro.in    | 2 +-
 src/makefile.am              | 2 +-
 src/qbrowserlib/makefile.am  | 6 +++---
 src/qbrowserlib/qmake.pro.in | 6 ++----
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/designer/makefile.am b/src/designer/makefile.am
index df80b50..ea3a67c 100644
--- a/src/designer/makefile.am
+++ b/src/designer/makefile.am
@@ -89,6 +89,6 @@ clean-local:
 
 # $(LANGS:%=@PACKAGENAME@_%.qm)
 CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} \
-             *.o *.obj qrc_*.cpp ui_*.h moc_*.cpp \
+             *.o *.obj qrc_*.cpp ui_*.h moc_*.cpp *.dll \
 	     ${QMAKE_TARGET:%=lib%*}
 MAINTAINERCLEANFILES = makefile.in ${QMAKE_MAKEFILE}
diff --git a/src/designer/qmake.pro.in b/src/designer/qmake.pro.in
index 5f89993..7710a6b 100644
--- a/src/designer/qmake.pro.in
+++ b/src/designer/qmake.pro.in
@@ -27,7 +27,7 @@ macx {
 win32 {
   QMAKE_LIBS += -lwinhttp -lgdi32 -lws2_32
   QMAKE_LIBS += /opt/local/i586-mingw32msvc/lib/winscard.a
-  CONFIG += release
+  CONFIG += release dll
 }
 
 FORMS = 
diff --git a/src/makefile.am b/src/makefile.am
index 8eacb4e..f59a68e 100644
--- a/src/makefile.am
+++ b/src/makefile.am
@@ -89,6 +89,6 @@ clean-local:
 
 CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} $(LANGS:%=@PACKAGENAME@_%.qm) \
              *.o *.obj qrc_*.cpp ui_*.h moc_*.cpp \
-	     ${QMAKE_TARGET} \
+	     ${QMAKE_TARGET} object_script.swissbrowser \
 	     @PACKAGENAME@.xpm
 MAINTAINERCLEANFILES = makefile.in ${QMAKE_MAKEFILE}
diff --git a/src/qbrowserlib/makefile.am b/src/qbrowserlib/makefile.am
index 3a8500b..42a81bb 100644
--- a/src/qbrowserlib/makefile.am
+++ b/src/qbrowserlib/makefile.am
@@ -18,11 +18,11 @@ else
 endif
 endif
 
-EXTRA_DIST = @srcdir@/*.[ch]xx @srcdir@/*.ui @srcdir@/*.ts @srcdir@/*.qrc.in
+EXTRA_DIST = @srcdir@/*.[ch]xx @srcdir@/*.ui @srcdir@/*.ts @srcdir@/languages.qrc.in
 
 LANGS = en de fr it
 ALL_SRC = @srcdir@/*.[ch]xx	\
-          *.qrc	\
+          languages.qrc	\
           @srcdir@/*.ui
 
 QMAKE_PROJECT = @srcdir@/qmake.pro
@@ -86,6 +86,6 @@ clean-local:
 	-rm -r ${QMAKE_TARGET}*
 
 CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} $(LANGS:%=qbrowserlib_%.qm) \
-             *.o *.obj qrc_*.cpp ui_*.h moc_*.cpp *.qrc \
+             *.o *.obj qrc_*.cpp ui_*.h moc_*.cpp *.qrc *.dll  \
 	     ${QMAKE_TARGET} \
 MAINTAINERCLEANFILES = makefile.in ${QMAKE_MAKEFILE}
diff --git a/src/qbrowserlib/qmake.pro.in b/src/qbrowserlib/qmake.pro.in
index 4c2b120..e65ff54 100644
--- a/src/qbrowserlib/qmake.pro.in
+++ b/src/qbrowserlib/qmake.pro.in
@@ -2,9 +2,7 @@ QT += webkit network gui
 QMAKE_LIBS += -lproxyface -lpcscxx -lssl -lcrypto
 QMAKE_CXXFLAGS += -Wno-parentheses -Wno-unused-parameter
 #-std=c++0x
-QMAKE_INCDIR += BULLSHIT1 @srcdir@/.. BULLSHIT2 .. BULLSHIT3
-INCLUDEPATH += BULLSHIT4 .. BULLSHIT5
-QMAKE_CXXFLAGS += -IBULLSHIT6 -I.. -IBULLSHIT7
+QMAKE_INCDIR += @srcdir@/.. ..
 
 unix {
   !macx {
@@ -26,7 +24,7 @@ macx {
 win32 {
   QMAKE_LIBS += -lwinhttp -lgdi32 -lws2_32
   QMAKE_LIBS += /opt/local/i586-mingw32msvc/lib/winscard.a
-  CONFIG += release
+  CONFIG += release dll
 }
 ICON = swissbrowser.icns