From d14350adddf830dfc1d4778d5171866838eac93a Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 28 Jan 2007 15:43:04 +0000 Subject: [PATCH] Move console into subdir git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4066 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/qt-console/Makefile | 27 +++++++++---------- bacula/src/qt-console/bat.pro | 6 ++--- .../src/qt-console/{ => console}/console.cpp | 0 bacula/src/qt-console/{ => console}/console.h | 0 4 files changed, 15 insertions(+), 18 deletions(-) rename bacula/src/qt-console/{ => console}/console.cpp (100%) rename bacula/src/qt-console/{ => console}/console.h (100%) diff --git a/bacula/src/qt-console/Makefile b/bacula/src/qt-console/Makefile index ab5da4f5ab..e59111f8c6 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 Jan 28 16:32:50 2007 +# Generated by qmake (2.01a) (Qt 4.2.1) on: Sun Jan 28 16:40:37 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. -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 -I.. -I. -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 @@ -49,7 +49,7 @@ SOURCES = main.cpp \ authenticate.cpp \ bat_conf.cpp \ mainwin.cpp \ - console.cpp moc_mainwin.cpp \ + console/console.cpp moc_mainwin.cpp \ moc_console.cpp \ qrc_main.cpp OBJECTS = main.o \ @@ -150,7 +150,7 @@ qmake: FORCE 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 console.h .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.qrc .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.cpp authenticate.cpp bat_conf.cpp mainwin.cpp console.cpp .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.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 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/bat1.0.0/ && $(COPY_FILE) --parents mainwin.h bat.h bat_conf.h console/console.h .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.qrc .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.cpp authenticate.cpp bat_conf.cpp mainwin.cpp console/console.cpp .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.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 yaccclean: @@ -182,9 +182,9 @@ moc_mainwin.cpp: ui_main.h \ /usr/bin/moc /usr/bin/moc $(DEFINES) $(INCPATH) mainwin.h -o moc_mainwin.cpp -moc_console.cpp: console.h \ +moc_console.cpp: console/console.h \ /usr/bin/moc - /usr/bin/moc $(DEFINES) $(INCPATH) console.h -o moc_console.cpp + /usr/bin/moc $(DEFINES) $(INCPATH) console/console.h -o moc_console.cpp compiler_rcc_make_all: qrc_main.cpp compiler_rcc_clean: @@ -218,15 +218,13 @@ compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_image_coll main.o: main.cpp bat.h \ mainwin.h \ ui_main.h \ - bat_conf.h \ - console.h + bat_conf.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp authenticate.o: authenticate.cpp bat.h \ mainwin.h \ ui_main.h \ - bat_conf.h \ - console.h + bat_conf.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o authenticate.o authenticate.cpp bat_conf.o: bat_conf.cpp bat_conf.h @@ -235,16 +233,15 @@ bat_conf.o: bat_conf.cpp bat_conf.h mainwin.o: mainwin.cpp bat.h \ mainwin.h \ ui_main.h \ - bat_conf.h \ - console.h + bat_conf.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwin.o mainwin.cpp -console.o: console.cpp bat.h \ +console.o: console/console.cpp bat.h \ mainwin.h \ ui_main.h \ bat_conf.h \ - console.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o console.o console.cpp + console/console.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o console.o console/console.cpp moc_mainwin.o: moc_mainwin.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwin.o moc_mainwin.cpp diff --git a/bacula/src/qt-console/bat.pro b/bacula/src/qt-console/bat.pro index e7e092f31b..1d537f90fa 100644 --- a/bacula/src/qt-console/bat.pro +++ b/bacula/src/qt-console/bat.pro @@ -5,7 +5,7 @@ TEMPLATE = app TARGET = bat DEPENDPATH += . -INCLUDEPATH += . +INCLUDEPATH += . ./console INCLUDEPATH += .. LIBS += -L../lib LIBS += -lbac @@ -14,6 +14,6 @@ RESOURCES = main.qrc # Input FORMS += main.ui -HEADERS += mainwin.h bat.h bat_conf.h console.h +HEADERS += mainwin.h bat.h bat_conf.h console/console.h SOURCES += main.cpp authenticate.cpp bat_conf.cpp -SOURCES += mainwin.cpp console.cpp +SOURCES += mainwin.cpp console/console.cpp diff --git a/bacula/src/qt-console/console.cpp b/bacula/src/qt-console/console/console.cpp similarity index 100% rename from bacula/src/qt-console/console.cpp rename to bacula/src/qt-console/console/console.cpp diff --git a/bacula/src/qt-console/console.h b/bacula/src/qt-console/console/console.h similarity index 100% rename from bacula/src/qt-console/console.h rename to bacula/src/qt-console/console/console.h -- 2.39.5