Removed unused variables from Makefile.am(s)

Moved helpviewer to src directory Incidental chagnes to the mysql stubs git-svn-id: http://svn.osgeo.org/qgis/trunk@4626 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 9, 2006 · d57e3df · d57e3df
1 parent 21c5c13
commit d57e3df
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 8 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -31,7 +31,7 @@ docdatadir = $(datadir)/$(PACKAGE)/doc
 docdata_DATA = AUTHORS
 
 if HAVE_QT4
-SUBDIRS = src doc tools i18n helpviewer resources images
+SUBDIRS = src doc tools i18n resources images
 endif
 
 pkginclude_HEADERS = qgsconfig.h

diff --git a/configure.in b/configure.in
@@ -440,7 +440,6 @@ AC_CONFIG_FILES([
   doc/plugins/geoprocessing/buffer/Makefile
   doc/plugins/geoprocessing/Makefile
   doc/plugins/Makefile
-  helpviewer/Makefile
   i18n/Makefile
   images/Makefile
   images/developers/Makefile
@@ -462,6 +461,7 @@ AC_CONFIG_FILES([
   src/composer/Makefile
   src/core/Makefile
   src/designer/Makefile
+  src/helpviewer/Makefile
   src/gui/Makefile
   src/legend/Makefile
   src/mac/Contents/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -12,5 +12,5 @@
 #        depend on the existence of libqgis_gui. 
 #        gui *must* be specified immediately before the providers
 #        subdirectory. 
-SUBDIRS =  core ui legend raster composer widgets gui providers plugins $(MAC) 
+SUBDIRS =  core ui legend raster composer widgets gui providers plugins $(MAC) helpviewer
 
diff --git a/src/designer/Makefile.am b/src/designer/Makefile.am
@@ -25,7 +25,7 @@ qgisdesignerwidgets_la_SOURCES =  qgsdesignerwidgets.cpp \
 
 qgisdesignerwidgets_la_MOC = qgsprojectionselectorplugin.moc.cpp
 
-projectionselector_la_LIBADD =  ../src/gui/libqgis_gui.la $(QT_LDADD)  
+#projectionselector_la_LIBADD =  ../src/gui/libqgis_gui.la $(QT_LDADD)  
 #qgisdesignerwidgets_la_LIBADD =  $(QT_LDADD) ../widgets/projectionselector/libqgsprojectionselector.la
 qgisdesignerwidgets_la_LDFLAGS = -avoid-version -module
 qgisdesignerwidgets_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../gui/ -I../legend
diff --git a/helpviewer/.cvsignore → src/helpviewer/.cvsignore b/helpviewer/.cvsignore → src/helpviewer/.cvsignore
diff --git a/helpviewer/Makefile.am → src/helpviewer/Makefile.am b/helpviewer/Makefile.am → src/helpviewer/Makefile.am
diff --git a/helpviewer/helpviewer.pro → src/helpviewer/helpviewer.pro b/helpviewer/helpviewer.pro → src/helpviewer/helpviewer.pro
diff --git a/helpviewer/main.cpp → src/helpviewer/main.cpp b/helpviewer/main.cpp → src/helpviewer/main.cpp
diff --git a/helpviewer/qgshelpserver.cpp → src/helpviewer/qgshelpserver.cpp b/helpviewer/qgshelpserver.cpp → src/helpviewer/qgshelpserver.cpp
diff --git a/helpviewer/qgshelpserver.h → src/helpviewer/qgshelpserver.h b/helpviewer/qgshelpserver.h → src/helpviewer/qgshelpserver.h
diff --git a/helpviewer/qgshelpviewer.cpp → src/helpviewer/qgshelpviewer.cpp b/helpviewer/qgshelpviewer.cpp → src/helpviewer/qgshelpviewer.cpp
diff --git a/helpviewer/qgshelpviewer.h → src/helpviewer/qgshelpviewer.h b/helpviewer/qgshelpviewer.h → src/helpviewer/qgshelpviewer.h
diff --git a/helpviewer/qgshelpviewerbase.ui → src/helpviewer/qgshelpviewerbase.ui b/helpviewer/qgshelpviewerbase.ui → src/helpviewer/qgshelpviewerbase.ui
diff --git a/src/providers/mysql/mysql.pro b/src/providers/mysql/mysql.pro
@@ -2,7 +2,7 @@
 # Automatically generated by qmake (2.00a) Sat Jan 7 08:34:57 2006
 ######################################################################
 
-TEMPLATE = lib
+TEMPLATE = app
 TARGET += 
 DEPENDPATH += .
 INCLUDEPATH += . /usr/local/mysql/include/mysql ../../src ../..

diff --git a/src/providers/mysql/testmysql.cpp b/src/providers/mysql/testmysql.cpp
@@ -9,7 +9,7 @@ int main(int argc, char **argv)
   // init mysql 
   MYSQL db;
   MYSQL *res = mysql_init(&db);
-  MYSQL *con = mysql_real_connect(&db, "localhost", "sherman", "javado", "teZZt", 0, NULL, 0);
+  MYSQL *con = mysql_real_connect(&db, "localhost", "gsherman", 0, "test", 0, NULL, 0);
   if(con)
   {
     std::cout << "Connection successful" << std::endl; 

diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
@@ -155,8 +155,8 @@ postgresUIHEADERS = ui_qgsdbsourceselectbase.h	\
 		  ui_qgspgquerybuilderbase.h	
 
 BUILT_SOURCES = $(qgis_ui_UIHEADERS) $(postgresUIHEADERS) 
-
-qgis_ui_LDADD = $(LDADD) $(QT_LDADD) 
+# the following is not used anywhere so its commented out
+#qgis_ui_LDADD = $(LDADD) $(QT_LDADD) 
 qgis_ui_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) -I../widgets/projectionselector/ -I./legend/ -I./raster/
 
 CLEANFILES = $(BUILT_SOURCES)