Add bat Mac patch from bug #1953

[bacula/bacula] / bacula / src / qt-console / bat.pro.in

diff --git a/bacula/src/qt-console/bat.pro.in b/bacula/src/qt-console/bat.pro.in
index 828836d6926007da499f4386ca7934e90412e5d3..cacba21766384c05aae4c81594f98d4d2b3283ce 100644 (file)
--- a/bacula/src/qt-console/bat.pro.in
+++ b/bacula/src/qt-console/bat.pro.in
@@ -1,5 +1,4 @@
 ######################################################################
-# Version $Id$
 #
 #   !!!!!!! IMPORTANT !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #
@@ -7,20 +6,34 @@
 #
 #   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #    
-CONFIG += qt debug
+CONFIG += qt debug @QWT@
 
 bins.path = /$(DESTDIR)@sbindir@
-bins.files = ./bat
+bins.files = bat
 confs.path = /$(DESTDIR)@sysconfdir@
-confs.commands = ./install_conf_file   
+confs.commands = ./install_conf_file
+help.path = /$(DESTDIR)@docdir@
+help.files = help/*.html images/status.png images/mail-message-new.png
 
 TEMPLATE     = app
 TARGET       = bat
 DEPENDPATH  += .
 INCLUDEPATH += .. . ./console ./restore ./select
-INCLUDEPATH += @QWT_INC@ 
-LIBS        += -L../lib -lbac @OPENSSL_LIBS@
-LIBS        += @QWT_LDFLAGS@ -lqwt
+LIBS        += -L../lib -lbaccfg -lbac -L../findlib -lbacfind @OPENSSL_LIBS@
+LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
+LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
+QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
+QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
+QMAKE_CLEAN += .libs/* bat
+
+qwt {
+  INCLUDEPATH += @QWT_INC@ 
+  LIBS        += @QWT_LDFLAGS@ @QWT_LIB@
+}
+
+macx {
+  ICON = images/bat_icon.icns
+}
 
 RESOURCES    = main.qrc
 MOC_DIR      = moc
@@ -35,17 +48,21 @@ FORMS += relabel/relabel.ui
 FORMS += mount/mount.ui
 FORMS += console/console.ui
 FORMS += restore/restore.ui restore/prerestore.ui restore/brestore.ui
+FORMS += restore/runrestore.ui
 FORMS += restore/restoretree.ui
 FORMS += run/run.ui run/runcmd.ui run/estimate.ui run/prune.ui
-FORMS += select/select.ui
+FORMS += select/select.ui select/textinput.ui
 FORMS += medialist/medialist.ui mediaedit/mediaedit.ui joblist/joblist.ui
+FORMS += medialist/mediaview.ui
 FORMS += clients/clients.ui storage/storage.ui fileset/fileset.ui
-FORMS += joblog/joblog.ui jobs/jobs.ui
-FORMS += help/help.ui
-FORMS += jobgraphs/jobplotcontrols.ui
-FORMS += status/dirstat.ui
+FORMS += joblog/joblog.ui jobs/jobs.ui job/job.ui
+FORMS += help/help.ui mediainfo/mediainfo.ui
+FORMS += status/dirstat.ui storage/content.ui
 FORMS += status/clientstat.ui
 FORMS += status/storstat.ui
+qwt {
+  FORMS += jobgraphs/jobplotcontrols.ui
+}
 
 # Main directory
 HEADERS += mainwin.h bat.h bat_conf.h qstd.h pages.h
@@ -57,7 +74,7 @@ SOURCES += bcomm/dircomm.cpp bcomm/dircomm_auth.cpp
 
 # Console
 HEADERS += console/console.h
-SOURCES += console/authenticate.cpp console/console.cpp
+SOURCES += console/console.cpp
 
 # Restore
 HEADERS += restore/restore.h
@@ -80,13 +97,17 @@ HEADERS += run/run.h
 SOURCES += run/run.cpp run/runcmd.cpp run/estimate.cpp run/prune.cpp
 
 # Select dialog
-HEADERS += select/select.h
-SOURCES += select/select.cpp
+HEADERS += select/select.h select/textinput.h
+SOURCES += select/select.cpp select/textinput.cpp
 
 ## MediaList
 HEADERS += medialist/medialist.h
 SOURCES += medialist/medialist.cpp
 
+# MediaView
+HEADERS += medialist/mediaview.h
+SOURCES += medialist/mediaview.cpp
+
 ## MediaEdit
 HEADERS += mediaedit/mediaedit.h
 SOURCES += mediaedit/mediaedit.cpp
@@ -103,6 +124,10 @@ SOURCES += clients/clients.cpp
 HEADERS += storage/storage.h
 SOURCES += storage/storage.cpp
 
+## Storage content
+HEADERS += storage/content.h
+SOURCES += storage/content.cpp
+
 ## Fileset
 HEADERS += fileset/fileset.h
 SOURCES += fileset/fileset.cpp
@@ -111,6 +136,10 @@ SOURCES += fileset/fileset.cpp
 HEADERS += joblog/joblog.h
 SOURCES += joblog/joblog.cpp
 
+## Job
+HEADERS += job/job.h
+SOURCES += job/job.cpp
+
 ## Jobs
 HEADERS += jobs/jobs.h
 SOURCES += jobs/jobs.cpp
@@ -120,13 +149,19 @@ HEADERS += restore/restoretree.h
 SOURCES += restore/restoretree.cpp
 
 ## Job Step Graphs
-HEADERS += jobgraphs/jobplot.h
-SOURCES += jobgraphs/jobplot.cpp
+qwt {
+  HEADERS += jobgraphs/jobplot.h
+  SOURCES += jobgraphs/jobplot.cpp
+}
 
 # Help dialog
 HEADERS += help/help.h
 SOURCES += help/help.cpp
 
+# Media info dialog
+HEADERS += mediainfo/mediainfo.h
+SOURCES += mediainfo/mediainfo.cpp
+
 ## Status Dir
 HEADERS += status/dirstat.h
 SOURCES += status/dirstat.cpp
@@ -140,11 +175,10 @@ HEADERS += status/storstat.h
 SOURCES += status/storstat.cpp
 
 # Utility sources
-HEADERS += util/fmtwidgetitem.h
-SOURCES += util/fmtwidgetitem.cpp
+HEADERS += util/fmtwidgetitem.h util/comboutil.h
+SOURCES += util/fmtwidgetitem.cpp util/comboutil.cpp
 
-INSTALLS += bins
-INSTALLS += confs
+INSTALLS = bins confs help
 
 QMAKE_EXTRA_TARGETS += depend