projects / confmgr / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added About Dialog, Updated UI, Fixed Bug 6669
[confmgr] / src / Makefile
diff --git a/src/Makefile b/src/Makefile
index 27fb321..d0774bf 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,22 +1,22 @@
 #############################################################################
-# Makefile for building: confmgr
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Sat Jul 3 23:40:14 2010
-# Project:  confmgr.pro
+# Makefile for building: ../confmgr
+# Generated by qmake (2.01a) (Qt 4.7.0) on: Wed Nov 17 15:43:23 2010
+# Project:  src.pro
 # Template: app
-# Command: /usr/bin/qmake -unix -o Makefile confmgr.pro
+# Command: /usr/bin/qmake -o Makefile src.pro
 #############################################################################
 
 ####### Compiler, tools and options
 
 CC            = gcc
 CXX           = g++
-DEFINES       = -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_DBUS_LIB -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
+DEFINES       = -DDATADIR=\"/usr/local/share\" -DPKGDATADIR=\"\" -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_DBUS_LIB -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
 CFLAGS        = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
 CXXFLAGS      = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
 INCPATH       = -I/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++ -I. -I/targets/FREMANTLE_X86/usr/include/QtCore -I/targets/FREMANTLE_X86/usr/include/QtGui -I/targets/FREMANTLE_X86/usr/include/QtXml -I/targets/FREMANTLE_X86/usr/include/QtDBus -I/targets/FREMANTLE_X86/usr/include/QtMaemo5 -I/targets/FREMANTLE_X86/usr/include -I. -I.
 LINK          = g++
-LFLAGS        = -Wl,-O1 -Wl,-rpath,/usr/lib
-LIBS          = $(SUBLIBS)  -L/usr/lib -lQtMaemo5 -L/usr/lib -L/usr/X11R6/lib -lQtDBus -lQtXml -lQtGui -lQtCore -lpthread 
+LFLAGS        = -Wl,-O1
+LIBS          = $(SUBLIBS)  -L/usr/lib -lQtMaemo5 -L/usr/lib -L/usr/X11R6/lib -lQtGui -lQtDBus -lQtXml -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
 QMAKE         = /usr/bin/qmake
@@ -51,13 +51,15 @@ SOURCES       = main.cpp \
                addprofile.cpp \
                addstep.cpp \
                dbusutility.cpp \
-               confmanager.cpp moc_mainwindow.cpp \
+               confmanager.cpp \
+               aboutdialog.cpp moc_mainwindow.cpp \
                moc_xmlutil.cpp \
                moc_profile.cpp \
                moc_config.cpp \
                moc_addprofile.cpp \
                moc_addstep.cpp \
-               moc_confmanager.cpp
+               moc_confmanager.cpp \
+               moc_aboutdialog.cpp
 OBJECTS       = main.o \
                mainwindow.o \
                xmlutil.o \
@@ -67,17 +69,20 @@ OBJECTS       = main.o \
                addstep.o \
                dbusutility.o \
                confmanager.o \
+               aboutdialog.o \
                moc_mainwindow.o \
                moc_xmlutil.o \
                moc_profile.o \
                moc_config.o \
                moc_addprofile.o \
                moc_addstep.o \
-               moc_confmanager.o
+               moc_confmanager.o \
+               moc_aboutdialog.o
 DIST          = /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
@@ -95,10 +100,10 @@ DIST          = /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf \
-               confmgr.pro
+               src.pro
 QMAKE_TARGET  = confmgr
-DESTDIR       = 
-TARGET        = confmgr
+DESTDIR       = ../
+TARGET        = ../confmgr
 
 first: all
 ####### Implicit rules
@@ -124,13 +129,15 @@ first: all
 
 all: Makefile $(TARGET)
 
-$(TARGET): ui_mainwindow.h ui_addprofile.h ui_addstep.h $(OBJECTS)  
+$(TARGET): ui_mainwindow.h ui_addprofile.h ui_addstep.h ui_aboutdialog.h $(OBJECTS)  
+       @$(CHK_DIR_EXISTS) ../ || $(MKDIR) ../ 
        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
-Makefile: confmgr.pro  /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qmake.conf /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \
+Makefile: src.pro  /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qmake.conf /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
@@ -149,15 +156,16 @@ Makefile: confmgr.pro  /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qm
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf \
                /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf \
                /usr/lib/libQtMaemo5.prl \
+               /usr/lib/libQtGui.prl \
                /usr/lib/libQtDBus.prl \
                /usr/lib/libQtXml.prl \
-               /usr/lib/libQtCore.prl \
-               /usr/lib/libQtGui.prl
-       $(QMAKE) -unix -o Makefile confmgr.pro
+               /usr/lib/libQtCore.prl
+       $(QMAKE) -o Makefile src.pro
 /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf:
 /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf:
 /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf:
 /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri:
+/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri:
 /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf:
 /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf:
 /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
@@ -176,16 +184,16 @@ Makefile: confmgr.pro  /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qm
 /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf:
 /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf:
 /usr/lib/libQtMaemo5.prl:
+/usr/lib/libQtGui.prl:
 /usr/lib/libQtDBus.prl:
 /usr/lib/libQtXml.prl:
 /usr/lib/libQtCore.prl:
-/usr/lib/libQtGui.prl:
 qmake:  FORCE
-       @$(QMAKE) -unix -o Makefile confmgr.pro
+       @$(QMAKE) -o Makefile src.pro
 
 dist: 
        @$(CHK_DIR_EXISTS) .tmp/confmgr1.0.0 || $(MKDIR) .tmp/confmgr1.0.0 
-       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/confmgr1.0.0/ && $(COPY_FILE) --parents mainwindow.h xmlutil.h profile.h config.h addprofile.h addstep.h dbusutility.h confmanager.h .tmp/confmgr1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp xmlutil.cpp profile.cpp config.cpp addprofile.cpp addstep.cpp dbusutility.cpp confmanager.cpp .tmp/confmgr1.0.0/ && $(COPY_FILE) --parents mainwindow.ui addprofile.ui addstep.ui .tmp/confmgr1.0.0/ && (cd `dirname .tmp/confmgr1.0.0` && $(TAR) confmgr1.0.0.tar confmgr1.0.0 && $(COMPRESS) confmgr1.0.0.tar) && $(MOVE) `dirname .tmp/confmgr1.0.0`/confmgr1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/confmgr1.0.0
+       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/confmgr1.0.0/ && $(COPY_FILE) --parents mainwindow.h xmlutil.h profile.h config.h addprofile.h addstep.h dbusutility.h confmanager.h aboutdialog.h .tmp/confmgr1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp xmlutil.cpp profile.cpp config.cpp addprofile.cpp addstep.cpp dbusutility.cpp confmanager.cpp aboutdialog.cpp .tmp/confmgr1.0.0/ && $(COPY_FILE) --parents mainwindow.ui addprofile.ui addstep.ui aboutdialog.ui .tmp/confmgr1.0.0/ && (cd `dirname .tmp/confmgr1.0.0` && $(TAR) confmgr1.0.0.tar confmgr1.0.0 && $(COMPRESS) confmgr1.0.0.tar) && $(MOVE) `dirname .tmp/confmgr1.0.0`/confmgr1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/confmgr1.0.0
 
 
 clean:compiler_clean 
@@ -200,13 +208,15 @@ distclean: clean
        -$(DEL_FILE) Makefile
 
 
+check: first
+
 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_mainwindow.cpp moc_xmlutil.cpp moc_profile.cpp moc_config.cpp moc_addprofile.cpp moc_addstep.cpp moc_confmanager.cpp
+compiler_moc_header_make_all: moc_mainwindow.cpp moc_xmlutil.cpp moc_profile.cpp moc_config.cpp moc_addprofile.cpp moc_addstep.cpp moc_confmanager.cpp moc_aboutdialog.cpp
 compiler_moc_header_clean:
-       -$(DEL_FILE) moc_mainwindow.cpp moc_xmlutil.cpp moc_profile.cpp moc_config.cpp moc_addprofile.cpp moc_addstep.cpp moc_confmanager.cpp
+       -$(DEL_FILE) moc_mainwindow.cpp moc_xmlutil.cpp moc_profile.cpp moc_config.cpp moc_addprofile.cpp moc_addstep.cpp moc_confmanager.cpp moc_aboutdialog.cpp
 moc_mainwindow.cpp: config.h \
                profile.h \
                addprofile.h \
@@ -241,6 +251,9 @@ moc_confmanager.cpp: profile.h \
                confmanager.h
        /usr/bin/moc $(DEFINES) $(INCPATH) confmanager.h -o moc_confmanager.cpp
 
+moc_aboutdialog.cpp: aboutdialog.h
+       /usr/bin/moc $(DEFINES) $(INCPATH) aboutdialog.h -o moc_aboutdialog.cpp
+
 compiler_dbus_interface_source_make_all:
 compiler_dbus_interface_source_clean:
 compiler_dbus_adaptor_source_make_all:
@@ -260,9 +273,9 @@ compiler_dbus_adaptor_header_make_all:
 compiler_dbus_adaptor_header_clean:
 compiler_dbus_adaptor_moc_make_all:
 compiler_dbus_adaptor_moc_clean:
-compiler_uic_make_all: ui_mainwindow.h ui_addprofile.h ui_addstep.h
+compiler_uic_make_all: ui_mainwindow.h ui_addprofile.h ui_addstep.h ui_aboutdialog.h
 compiler_uic_clean:
-       -$(DEL_FILE) ui_mainwindow.h ui_addprofile.h ui_addstep.h
+       -$(DEL_FILE) ui_mainwindow.h ui_addprofile.h ui_addstep.h ui_aboutdialog.h
 ui_mainwindow.h: mainwindow.ui
        /usr/bin/uic mainwindow.ui -o ui_mainwindow.h
 
@@ -272,6 +285,9 @@ ui_addprofile.h: addprofile.ui
 ui_addstep.h: addstep.ui
        /usr/bin/uic addstep.ui -o ui_addstep.h
 
+ui_aboutdialog.h: aboutdialog.ui
+       /usr/bin/uic aboutdialog.ui -o ui_aboutdialog.h
+
 compiler_yacc_decl_make_all:
 compiler_yacc_decl_clean:
 compiler_yacc_impl_make_all:
@@ -299,7 +315,8 @@ mainwindow.o: mainwindow.cpp mainwindow.h \
                confmanager.h \
                dbusutility.h \
                ui_mainwindow.h \
-               xmlutil.h
+               xmlutil.h \
+               aboutdialog.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o mainwindow.cpp
 
 xmlutil.o: xmlutil.cpp xmlutil.h \
@@ -334,6 +351,10 @@ confmanager.o: confmanager.cpp confmanager.h \
                dbusutility.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o confmanager.o confmanager.cpp
 
+aboutdialog.o: aboutdialog.cpp aboutdialog.h \
+               ui_aboutdialog.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o aboutdialog.o aboutdialog.cpp
+
 moc_mainwindow.o: moc_mainwindow.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp
 
@@ -355,11 +376,34 @@ moc_addstep.o: moc_addstep.cpp
 moc_confmanager.o: moc_confmanager.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_confmanager.o moc_confmanager.cpp
 
+moc_aboutdialog.o: moc_aboutdialog.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_aboutdialog.o moc_aboutdialog.cpp
+
 ####### Install
 
-install:   FORCE
+install_target: first FORCE
+       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/ 
+       -$(INSTALL_PROGRAM) "../$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
+       -$(STRIP) "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
+
+uninstall_target:  FORCE
+       -$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
+       -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/ 
+
+
+install_desktop: first FORCE
+       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/applications/hildon/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/applications/hildon/ 
+       -$(INSTALL_FILE) /home/naresh/dev/confmgr-0.1/src/confmgr.desktop $(INSTALL_ROOT)/usr/local/share/applications/hildon/
+
+
+uninstall_desktop:  FORCE
+       -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/applications/hildon/confmgr.desktop
+       -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/applications/hildon/ 
+
+
+install:  install_target install_desktop  FORCE
 
-uninstall:   FORCE
+uninstall: uninstall_target uninstall_desktop   FORCE
 
 FORCE:
 
Unnamed repository; edit this file to name it for gitweb.