From: Stefan Bund <stefan@j32.de>
Date: Tue, 26 Oct 2010 08:29:46 +0000 (+0200)
Subject: Use qmake/make instead of scons as build-system
X-Git-Url: http://g0dil.de/git?p=pykit.git;a=commitdiff_plain;h=c27095abe3702b4d38c9a13ec2e7c75c046afdb1

Use qmake/make instead of scons as build-system
---

diff --git a/.gitignore b/.gitignore
index 3f1142b..2daed2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ moc_*
 .sconsign*
 *.moc
 /pykit
+/Makefile
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e0d07f9..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "site_scons/qtscons"]
-	path = site_scons/qtscons
-	url = git://git.j32.de/qtscons.git
diff --git a/SConscript b/SConscript
deleted file mode 100644
index 2614eb2..0000000
--- a/SConscript
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- python -*-
-
-import os.path
-Import('env')
-
-env.Tool('qt4', [ os.path.join('site_scons','qtscons') ])
-
-# QtSvg and QtXml are needed by some plugins ...
-env.EnableQt4Modules([ 'QtWebKit', 'QtNetwork', 'QtSvg', 'QtXml', 'QtGui', 'QtCore' ])
-
-env.Append(
-    CXXFLAGS = [ '-Wall', '-Wextra' ],
-    LIBS     = [ '$BOOSTPYLIBS', '$POPPLERLIBS' ],
-)
-
-pykit = env.Program('pykit', env.Qt4Glob())
-env.Default(pykit)
diff --git a/SConstruct b/SConstruct
deleted file mode 100644
index a5b3878..0000000
--- a/SConstruct
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- python -*-
-
-import os
-
-env = Environment(ENV = os.environ)
-
-env.SetDefault(
-    BOOSTPYLIBS = [ 'boost_python' ],
-    POPPLERLIBS = [ 'poppler', 'poppler-qt4' ],
-)
-
-env.MergeFlags('!python-config --cflags')
-env.MergeFlags('!python-config --ldflags')
-
-Export('env')
-env.SConscript("SConscript")
diff --git a/pykit.pro b/pykit.pro
new file mode 100644
index 0000000..63d9604
--- /dev/null
+++ b/pykit.pro
@@ -0,0 +1,29 @@
+TEMPLATE = app
+TARGET = pykit
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += webkit network gui core
+
+# boost_python
+LIBS += -lboost_python
+
+# python
+QMAKE_CXXFLAGS += $$system(python-config --cflags)
+QMAKE_CFFLAGS += $$system(python-config --cflags)
+LIBS += $$system(python-config --ldflags)
+
+# poppler
+LIBS += -lpoppler-qt4 -lpoppler
+
+# Input
+HEADERS += MainWindow.hh \
+           Publisher.hh \
+           PythonPublisher.hh \
+           Viewer.hh \
+           PDFWidget.hh
+SOURCES += main.cc \
+           MainWindow.cc \
+           Publisher.cc \
+           PythonPublisher.cc \
+           Viewer.cc \
+           PDFWidget.cc
diff --git a/site_scons/qtscons b/site_scons/qtscons
deleted file mode 160000
index d2af983..0000000
--- a/site_scons/qtscons
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d2af983e689640420972f36d446dab0ed0c2e22e