From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 11 Feb 2007 20:13:20 +0000 (+0000)
Subject: move moc files into moc and .o into obj
X-Git-Tag: Release-7.0.0~6907
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3c9c4c5eb8af4e8d4eab0c466afc6d6ae83814be;p=bacula%2Fbacula

move moc files into moc and .o into obj

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4165 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/qt-console/Makefile b/bacula/src/qt-console/Makefile
index 990b89a130..fa5deb368a 100644
--- a/bacula/src/qt-console/Makefile
+++ b/bacula/src/qt-console/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: bat
-# Generated by qmake (2.01a) (Qt 4.2.1) on: Sun Feb 11 19:50:38 2007
+# Generated by qmake (2.01a) (Qt 4.2.1) on: Sun Feb 11 21:06:09 2007
 # Project:  bat.pro
 # Template: app
 # Command: /usr/bin/qmake -unix -o Makefile bat.pro
@@ -17,7 +17,7 @@ CFLAGS        = -pipe -O2 -Wall -W -D_REENTRANT  $(DEFINES)
 CXXFLAGS      = -pipe -O2 -Wall -W -D_REENTRANT  $(DEFINES)
 LEXFLAGS      = 
 YACCFLAGS     = -d
-INCPATH       = -I/usr/share/qt4/mkspecs/default -I. -I/usr/include/QtCore -I/usr/include/QtCore -I/usr/include/QtGui -I/usr/include/QtGui -I/usr/include -I. -Iconsole -Irestore -I.. -I. -I.
+INCPATH       = -I/usr/share/qt4/mkspecs/default -I. -I/usr/include/QtCore -I/usr/include/QtCore -I/usr/include/QtGui -I/usr/include/QtGui -I/usr/include -I. -Iconsole -Irestore -I.. -Imoc -I.
 LINK          = g++
 LFLAGS        = 
 LIBS          = $(SUBLIBS)  -L/usr/lib -L../lib -lbac -lssl -lcrypto -lQtGui -L/usr/lib -L/usr/X11R6/lib -lpng -lSM -lICE -lXi -lXrender -lXrandr -lXfixes -lXcursor -lXinerama -lfreetype -lfontconfig -lXext -lX11 -lQtCore -lz -lm -ldl -lpthread
@@ -41,7 +41,7 @@ MKDIR         = mkdir -p
 
 ####### Output directory
 
-OBJECTS_DIR   = ./
+OBJECTS_DIR   = obj/
 
 ####### Files
 
@@ -53,27 +53,27 @@ SOURCES       = main.cpp \
 		console/console.cpp \
 		restore/brestore.cpp \
 		label/label.cpp \
-		run/run.cpp moc_mainwin.cpp \
-		moc_console.cpp \
-		moc_restore.cpp \
-		moc_label.cpp \
-		moc_run.cpp \
+		run/run.cpp moc/moc_mainwin.cpp \
+		moc/moc_console.cpp \
+		moc/moc_restore.cpp \
+		moc/moc_label.cpp \
+		moc/moc_run.cpp \
 		qrc_main.cpp
-OBJECTS       = main.o \
-		bat_conf.o \
-		mainwin.o \
-		qstd.o \
-		authenticate.o \
-		console.o \
-		brestore.o \
-		label.o \
-		run.o \
-		moc_mainwin.o \
-		moc_console.o \
-		moc_restore.o \
-		moc_label.o \
-		moc_run.o \
-		qrc_main.o
+OBJECTS       = obj/main.o \
+		obj/bat_conf.o \
+		obj/mainwin.o \
+		obj/qstd.o \
+		obj/authenticate.o \
+		obj/console.o \
+		obj/brestore.o \
+		obj/label.o \
+		obj/run.o \
+		obj/moc_mainwin.o \
+		obj/moc_console.o \
+		obj/moc_restore.o \
+		obj/moc_label.o \
+		obj/moc_run.o \
+		obj/qrc_main.o
 DIST          = /usr/share/qt4/mkspecs/common/unix.conf \
 		/usr/share/qt4/mkspecs/common/g++.conf \
 		/usr/share/qt4/mkspecs/common/linux.conf \
@@ -163,8 +163,8 @@ qmake:  FORCE
 	@$(QMAKE) -unix -o Makefile bat.pro
 
 dist: 
-	@$(CHK_DIR_EXISTS) .tmp/bat1.0.0 || $(MKDIR) .tmp/bat1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/bat1.0.0/ && $(COPY_FILE) --parents mainwin.h bat.h bat_conf.h qstd.h console/console.h restore/restore.h label/label.h run/run.h .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.qrc .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.cpp bat_conf.cpp mainwin.cpp qstd.cpp console/authenticate.cpp console/console.cpp restore/brestore.cpp label/label.cpp run/run.cpp .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.ui label/label.ui console/console.ui restore/brestore.ui restore/restore.ui restore/restore-select.ui run/run.ui .tmp/bat1.0.0/ && (cd `dirname .tmp/bat1.0.0` && $(TAR) bat1.0.0.tar bat1.0.0 && $(COMPRESS) bat1.0.0.tar) && $(MOVE) `dirname .tmp/bat1.0.0`/bat1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/bat1.0.0
+	@$(CHK_DIR_EXISTS) obj/bat1.0.0 || $(MKDIR) obj/bat1.0.0 
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) obj/bat1.0.0/ && $(COPY_FILE) --parents mainwin.h bat.h bat_conf.h qstd.h console/console.h restore/restore.h label/label.h run/run.h obj/bat1.0.0/ && $(COPY_FILE) --parents main.qrc obj/bat1.0.0/ && $(COPY_FILE) --parents main.cpp bat_conf.cpp mainwin.cpp qstd.cpp console/authenticate.cpp console/console.cpp restore/brestore.cpp label/label.cpp run/run.cpp obj/bat1.0.0/ && $(COPY_FILE) --parents main.ui label/label.ui console/console.ui restore/brestore.ui restore/restore.ui restore/restore-select.ui run/run.ui obj/bat1.0.0/ && (cd `dirname obj/bat1.0.0` && $(TAR) bat1.0.0.tar bat1.0.0 && $(COMPRESS) bat1.0.0.tar) && $(MOVE) `dirname obj/bat1.0.0`/bat1.0.0.tar.gz . && $(DEL_FILE) -r obj/bat1.0.0
 
 
 yaccclean:
@@ -188,37 +188,37 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: moc_mainwin.cpp moc_console.cpp moc_restore.cpp moc_label.cpp moc_run.cpp
+compiler_moc_header_make_all: moc/moc_mainwin.cpp moc/moc_console.cpp moc/moc_restore.cpp moc/moc_label.cpp moc/moc_run.cpp
 compiler_moc_header_clean:
-	-$(DEL_FILE) moc_mainwin.cpp moc_console.cpp moc_restore.cpp moc_label.cpp moc_run.cpp
-moc_mainwin.cpp: ui_main.h \
+	-$(DEL_FILE) moc/moc_mainwin.cpp moc/moc_console.cpp moc/moc_restore.cpp moc/moc_label.cpp moc/moc_run.cpp
+moc/moc_mainwin.cpp: ui_main.h \
 		label/label.h \
 		ui_label.h \
 		run/run.h \
 		ui_run.h \
 		mainwin.h \
 		/usr/bin/moc
-	/usr/bin/moc $(DEFINES) $(INCPATH) mainwin.h -o moc_mainwin.cpp
+	/usr/bin/moc $(DEFINES) $(INCPATH) mainwin.h -o moc/moc_mainwin.cpp
 
-moc_console.cpp: ui_console.h \
+moc/moc_console.cpp: ui_console.h \
 		console/console.h \
 		/usr/bin/moc
-	/usr/bin/moc $(DEFINES) $(INCPATH) console/console.h -o moc_console.cpp
+	/usr/bin/moc $(DEFINES) $(INCPATH) console/console.h -o moc/moc_console.cpp
 
-moc_restore.cpp: ui_brestore.h \
+moc/moc_restore.cpp: ui_brestore.h \
 		restore/restore.h \
 		/usr/bin/moc
-	/usr/bin/moc $(DEFINES) $(INCPATH) restore/restore.h -o moc_restore.cpp
+	/usr/bin/moc $(DEFINES) $(INCPATH) restore/restore.h -o moc/moc_restore.cpp
 
-moc_label.cpp: ui_label.h \
+moc/moc_label.cpp: ui_label.h \
 		label/label.h \
 		/usr/bin/moc
-	/usr/bin/moc $(DEFINES) $(INCPATH) label/label.h -o moc_label.cpp
+	/usr/bin/moc $(DEFINES) $(INCPATH) label/label.h -o moc/moc_label.cpp
 
-moc_run.cpp: ui_run.h \
+moc/moc_run.cpp: ui_run.h \
 		run/run.h \
 		/usr/bin/moc
-	/usr/bin/moc $(DEFINES) $(INCPATH) run/run.h -o moc_run.cpp
+	/usr/bin/moc $(DEFINES) $(INCPATH) run/run.h -o moc/moc_run.cpp
 
 compiler_rcc_make_all: qrc_main.cpp
 compiler_rcc_clean:
@@ -274,7 +274,7 @@ compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_image_coll
 
 ####### Compile
 
-main.o: main.cpp bat.h \
+obj/main.o: main.cpp bat.h \
 		mainwin.h \
 		ui_main.h \
 		label/label.h \
@@ -283,12 +283,12 @@ main.o: main.cpp bat.h \
 		ui_run.h \
 		bat_conf.h \
 		qstd.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/main.o main.cpp
 
-bat_conf.o: bat_conf.cpp bat_conf.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o bat_conf.o bat_conf.cpp
+obj/bat_conf.o: bat_conf.cpp bat_conf.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/bat_conf.o bat_conf.cpp
 
-mainwin.o: mainwin.cpp bat.h \
+obj/mainwin.o: mainwin.cpp bat.h \
 		mainwin.h \
 		ui_main.h \
 		label/label.h \
@@ -297,12 +297,12 @@ mainwin.o: mainwin.cpp bat.h \
 		ui_run.h \
 		bat_conf.h \
 		qstd.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwin.o mainwin.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/mainwin.o mainwin.cpp
 
-qstd.o: qstd.cpp qstd.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o qstd.o qstd.cpp
+obj/qstd.o: qstd.cpp qstd.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/qstd.o qstd.cpp
 
-authenticate.o: console/authenticate.cpp bat.h \
+obj/authenticate.o: console/authenticate.cpp bat.h \
 		mainwin.h \
 		ui_main.h \
 		label/label.h \
@@ -311,9 +311,9 @@ authenticate.o: console/authenticate.cpp bat.h \
 		ui_run.h \
 		bat_conf.h \
 		qstd.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o authenticate.o console/authenticate.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/authenticate.o console/authenticate.cpp
 
-console.o: console/console.cpp bat.h \
+obj/console.o: console/console.cpp bat.h \
 		mainwin.h \
 		ui_main.h \
 		label/label.h \
@@ -324,9 +324,9 @@ console.o: console/console.cpp bat.h \
 		qstd.h \
 		console/console.h \
 		ui_console.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o console.o console/console.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/console.o console/console.cpp
 
-brestore.o: restore/brestore.cpp bat.h \
+obj/brestore.o: restore/brestore.cpp bat.h \
 		mainwin.h \
 		ui_main.h \
 		label/label.h \
@@ -337,9 +337,9 @@ brestore.o: restore/brestore.cpp bat.h \
 		qstd.h \
 		restore/restore.h \
 		ui_brestore.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o brestore.o restore/brestore.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/brestore.o restore/brestore.cpp
 
-label.o: label/label.cpp bat.h \
+obj/label.o: label/label.cpp bat.h \
 		mainwin.h \
 		ui_main.h \
 		label/label.h \
@@ -348,9 +348,9 @@ label.o: label/label.cpp bat.h \
 		ui_run.h \
 		bat_conf.h \
 		qstd.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o label.o label/label.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/label.o label/label.cpp
 
-run.o: run/run.cpp bat.h \
+obj/run.o: run/run.cpp bat.h \
 		mainwin.h \
 		ui_main.h \
 		label/label.h \
@@ -359,25 +359,25 @@ run.o: run/run.cpp bat.h \
 		ui_run.h \
 		bat_conf.h \
 		qstd.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o run.o run/run.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/run.o run/run.cpp
 
-moc_mainwin.o: moc_mainwin.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwin.o moc_mainwin.cpp
+obj/moc_mainwin.o: moc/moc_mainwin.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_mainwin.o moc/moc_mainwin.cpp
 
-moc_console.o: moc_console.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_console.o moc_console.cpp
+obj/moc_console.o: moc/moc_console.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_console.o moc/moc_console.cpp
 
-moc_restore.o: moc_restore.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_restore.o moc_restore.cpp
+obj/moc_restore.o: moc/moc_restore.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_restore.o moc/moc_restore.cpp
 
-moc_label.o: moc_label.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_label.o moc_label.cpp
+obj/moc_label.o: moc/moc_label.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_label.o moc/moc_label.cpp
 
-moc_run.o: moc_run.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_run.o moc_run.cpp
+obj/moc_run.o: moc/moc_run.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_run.o moc/moc_run.cpp
 
-qrc_main.o: qrc_main.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_main.o qrc_main.cpp
+obj/qrc_main.o: qrc_main.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/qrc_main.o qrc_main.cpp
 
 ####### Install
 
diff --git a/bacula/src/qt-console/README b/bacula/src/qt-console/README
index 2d94347479..db583c93ce 100644
--- a/bacula/src/qt-console/README
+++ b/bacula/src/qt-console/README
@@ -58,6 +58,7 @@ Design/implementation considerations:
 - Need to figure out a good implementation of adding pages and even
   having plugins that load as pages.  Currently the page mechanism
   is a bit kludged.
+- moc files should be moved into a subdirectory.
 
 Design decisions:
 - If possible all code for a particular component will be kept in
diff --git a/bacula/src/qt-console/bat.pro b/bacula/src/qt-console/bat.pro
index 48f0482b40..b23aab5a3e 100644
--- a/bacula/src/qt-console/bat.pro
+++ b/bacula/src/qt-console/bat.pro
@@ -11,6 +11,8 @@ LIBS        += -L../lib
 LIBS        += -lbac
 LIBS        += -lssl -lcrypto
 RESOURCES = main.qrc
+MOC_DIR = moc
+OBJECTS_DIR = obj
 
 # Main window
 FORMS += main.ui