Add install rules to project. Add missing conv headers

diff --git a/config.pri b/config.pri
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/import-mylist/import-mylist.pro b/import-mylist/import-mylist.pro
index 8b685711334ffa4a7f6bea2eb91d336b2089d760..03799ce8776d14413e37056887b51c1a079da331 100644 (file)
--- a/import-mylist/import-mylist.pro
+++ b/import-mylist/import-mylist.pro
@@ -1,6 +1,8 @@
 QT += core
 QT -= gui
 
+include(../config.pri)
+
 TARGET = import-mylist
 DESTDIR = ../build
 CONFIG += console
@@ -11,3 +13,6 @@ TEMPLATE = app
 SOURCES += main.cpp
 
 include(../localmylist.pri)
+
+target.path = $${PREFIX}/bin
+INSTALLS += target

diff --git a/import-titles/import-titles.pro b/import-titles/import-titles.pro
index 2ab825de03b3c67d4f5e06d701f49cbb5cae5933..8eb3fe997e32e15f5140eddbc4853607f34a99f5 100644 (file)
--- a/import-titles/import-titles.pro
+++ b/import-titles/import-titles.pro
@@ -1,6 +1,8 @@
 QT += core
 QT -= gui
 
+include(../config.pri)
+
 TARGET = import-titles
 DESTDIR = ../build
 CONFIG += console
@@ -11,3 +13,6 @@ TEMPLATE = app
 SOURCES += main.cpp
 
 include(../localmylist.pri)
+
+target.path = $${PREFIX}/bin
+INSTALLS += target

diff --git a/localmylist.pro b/localmylist.pro
index 208cee301adcacedd849753d3ed6c27cf0d88645..0ee37253f4cf70f733b19a6e12e93df6569fb442 100644 (file)
--- a/localmylist.pro
+++ b/localmylist.pro
@@ -1,9 +1,20 @@
 TEMPLATE = subdirs
 
+include(config.pri)
+
 SUBDIRS += \
-    localmylist \
-    search-gui \
-    import-titles \
-    import-mylist \
-    management-gui \
-    play-next
+       localmylist
+
+!nogui {
+       SUBDIRS += management-gui
+
+       !notools {
+               SUBDIRS += search-gui
+       }
+}
+
+!notools {
+       SUBDIRS += import-titles \
+               import-mylist \
+               play-next
+}

diff --git a/localmylist/include/LocalMyList/AbstractTask b/localmylist/include/LocalMyList/AbstractTask
new file mode 100644 (file)
index 0000000..bb5360a
--- /dev/null
+++ b/localmylist/include/LocalMyList/AbstractTask
@@ -0,0 +1 @@
+#include "../../abstracttask.h"

diff --git a/localmylist/include/LocalMyList/AddFileTask b/localmylist/include/LocalMyList/AddFileTask
new file mode 100644 (file)
index 0000000..e2f2a91
--- /dev/null
+++ b/localmylist/include/LocalMyList/AddFileTask
@@ -0,0 +1,2 @@
+#include "../../addfiletask.h"
+

diff --git a/localmylist/include/LocalMyList/AnimeTitleParseTask b/localmylist/include/LocalMyList/AnimeTitleParseTask
new file mode 100644 (file)
index 0000000..ea01654
--- /dev/null
+++ b/localmylist/include/LocalMyList/AnimeTitleParseTask
@@ -0,0 +1,2 @@
+#include "../../animetitleparsetask.h"
+

diff --git a/localmylist/include/LocalMyList/Database b/localmylist/include/LocalMyList/Database
index ff7ec1bcb1ced37e9f868982a4215ae0c37cbeb9..eaebf018becd797420d925feea9346cf37e4a93a 100644 (file)
--- a/localmylist/include/LocalMyList/Database
+++ b/localmylist/include/LocalMyList/Database
@@ -1 +1 @@
-#include ""
\ No newline at end of file
+#include "../../database.h"

diff --git a/localmylist/include/LocalMyList/DirectoryScanTask b/localmylist/include/LocalMyList/DirectoryScanTask
new file mode 100644 (file)
index 0000000..2a9f628
--- /dev/null
+++ b/localmylist/include/LocalMyList/DirectoryScanTask
@@ -0,0 +1,2 @@
+#include "../../directoryscan.h"
+

diff --git a/localmylist/include/LocalMyList/LocalMyList b/localmylist/include/LocalMyList/LocalMyList
deleted file mode 100644 (file)
index ff7ec1b..0000000
--- a/localmylist/include/LocalMyList/LocalMyList
+++ /dev/null
@@ -1 +0,0 @@
-#include ""
\ No newline at end of file

diff --git a/localmylist/include/LocalMyList/MyList b/localmylist/include/LocalMyList/MyList
new file mode 100644 (file)
index 0000000..0cbafda
--- /dev/null
+++ b/localmylist/include/LocalMyList/MyList
@@ -0,0 +1 @@
+#include "../../mylist.h"

diff --git a/localmylist/include/LocalMyList/MyListExportParseTask b/localmylist/include/LocalMyList/MyListExportParseTask
new file mode 100644 (file)
index 0000000..de76dd5
--- /dev/null
+++ b/localmylist/include/LocalMyList/MyListExportParseTask
@@ -0,0 +1,2 @@
+#include "../../mylistexportparsetask.h"
+

diff --git a/localmylist/include/LocalMyList/MyListModel b/localmylist/include/LocalMyList/MyListModel
new file mode 100644 (file)
index 0000000..a9f138a
--- /dev/null
+++ b/localmylist/include/LocalMyList/MyListModel
@@ -0,0 +1,2 @@
+#include "../../mylistmodel.h"
+

diff --git a/localmylist/include/LocalMyList/Settings b/localmylist/include/LocalMyList/Settings
new file mode 100644 (file)
index 0000000..40dfe8f
--- /dev/null
+++ b/localmylist/include/LocalMyList/Settings
@@ -0,0 +1,2 @@
+#include "../../settings.h"
+

diff --git a/localmylist/localmylist.pro b/localmylist/localmylist.pro
index a21a1711bbb2fdda263a51a5a6f05b9eed9a5bd9..53c26b43c241be1da1ed2cf7e67ec4ef155cb55d 100644 (file)
--- a/localmylist/localmylist.pro
+++ b/localmylist/localmylist.pro
@@ -1,6 +1,8 @@
 QT += network sql xml xmlpatterns
 QT -= gui
 
+include(../config.pri)
+
 TARGET = localmylist
 DESTDIR = ../build
 TEMPLATE = lib
@@ -11,34 +13,50 @@ SOURCES += \
        database.cpp \
        workthread.cpp \
        addfiletask.cpp \
-    abstracttask.cpp \
-    directoryscantask.cpp \
-    requesthandler.cpp \
-    mylist.cpp \
-    mylistmodel.cpp \
-    mylistnode.cpp \
-    animetitleparsetask.cpp \
-    mylistexportparsetask.cpp \
-    settings.cpp
-
-HEADERS +=\
+       abstracttask.cpp \
+       directoryscantask.cpp \
+       requesthandler.cpp \
+       mylist.cpp \
+       mylistmodel.cpp \
+       mylistnode.cpp \
+       animetitleparsetask.cpp \
+       mylistexportparsetask.cpp \
+       settings.cpp
+
+HEADERS += \
        localmylist_global.h \
        database.h \
        workthread.h \
        addfiletask.h \
-    abstracttask.h \
-    directoryscantask.h \
-    requesthandler.h \
-    mylist.h \
-    mylistmodel.h \
-    mylistnode.h \
-    animetitleparsetask.h \
-    mylistexportparsetask.h \
-    settings.h
-
-unix {
-       target.path = /usr/lib
-       INSTALLS += target
-}
+       abstracttask.h \
+       directoryscantask.h \
+       requesthandler.h \
+       mylist.h \
+       mylistmodel.h \
+       mylistnode.h \
+       animetitleparsetask.h \
+       mylistexportparsetask.h \
+       settings.h
+
+CONV_HEADERS += \
+       include/LocalMyList/AbstractTask \
+       include/LocalMyList/AddFileTask \
+       include/LocalMyList/AnimeTitleParseTask \
+       include/LocalMyList/Database \
+       include/LocalMyList/DirectoryScanTask \
+       include/LocalMyList/MyList \
+       include/LocalMyList/MyListExportParseTask \
+       include/LocalMyList/MyListModel \
+       include/LocalMyList/Settings
 
 LIBS += -lanidbudpclient
+
+target.path = $${PREFIX}/lib
+
+headers.path = $${PREFIX}/include/LocalMyList
+headers.files = $$HEADERS
+
+conv_headers.path = $${PREFIX}/include/LocalMyList
+conv_headers.files = $$CONV_HEADERS
+
+INSTALLS += target headers conv_headers

diff --git a/management-gui/management-gui.pro b/management-gui/management-gui.pro
index 402d907f21627c7faa05c52f82b7ed4da658c09d..8f21f5294028f68ff1c7c600efa9e21a89e94c6b 100644 (file)
--- a/management-gui/management-gui.pro
+++ b/management-gui/management-gui.pro
@@ -1,24 +1,23 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2012-02-16T17:36:59
-#
-#-------------------------------------------------
-
 QT       += core gui
 
+include(../config.pri)
+
 TARGET = management-gui
 DESTDIR = ../build
 TEMPLATE = app
 
 
 SOURCES += main.cpp\
-        mainwindow.cpp \
-    databaseconnectiondialog.cpp
+               mainwindow.cpp \
+       databaseconnectiondialog.cpp
 
 HEADERS  += mainwindow.h \
-    databaseconnectiondialog.h
+       databaseconnectiondialog.h
 
 FORMS    += mainwindow.ui \
-    databaseconnectiondialog.ui
+       databaseconnectiondialog.ui
 
 include(../localmylist.pri)
+
+target.path = $${PREFIX}/bin
+INSTALLS += target

diff --git a/play-next/play-next.pro b/play-next/play-next.pro
index d2e8808b0fc70ca6078c25321499d524d7611433..74ca7cf66776fb03dcba99923dbd4ef2cc22cc67 100644 (file)
--- a/play-next/play-next.pro
+++ b/play-next/play-next.pro
@@ -1,13 +1,8 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2012-02-26T21:42:52
-#
-#-------------------------------------------------
-
 QT       += core
-
 QT       -= gui
 
+include(../config.pri)
+
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 TARGET = play-next
@@ -21,3 +16,6 @@ TEMPLATE = app
 SOURCES += main.cpp
 
 include(../localmylist.pri)
+
+target.path = $${PREFIX}/bin
+INSTALLS += target

diff --git a/search-gui/search-gui.pro b/search-gui/search-gui.pro
index ed0ba856ac18e406ff26f45c988b03bb616d7821..7a062b6b5f35c4e5208d2b148acd1d1af4187f60 100644 (file)
--- a/search-gui/search-gui.pro
+++ b/search-gui/search-gui.pro
@@ -1,21 +1,20 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2012-02-13T02:45:41
-#
-#-------------------------------------------------
-
 QT       += core gui
 
+include(../config.pri)
+
 TARGET = search-gui
 DESTDIR = ../build
 TEMPLATE = app
 
 
 SOURCES += main.cpp\
-        mainwindow.cpp
+               mainwindow.cpp
 
-HEADERS  += mainwindow.h
+HEADERS += mainwindow.h
 
-FORMS    += mainwindow.ui
+FORMS += mainwindow.ui
 
 include(../localmylist.pri)
+
+target.path = $${PREFIX}/bin
+INSTALLS += target