SVN Commit by dpage: r4562 - in trunk/pgadmin3: src xtra/pgagent

Author: dpage
Date: 2005-10-18 17:21:06 +0100 (Tue, 18 Oct 2005)
New Revision: 4562

Modified:
trunk/pgadmin3/src/Makefile.am
trunk/pgadmin3/xtra/pgagent/Makefile.am
Log:
Add -Wno-non-virtual-dtor GCC option to stop GCC4 complaining

Modified: trunk/pgadmin3/src/Makefile.am
===================================================================
--- trunk/pgadmin3/src/Makefile.am 2005-10-18 08:52:29 UTC (rev 4561)
+++ trunk/pgadmin3/src/Makefile.am 2005-10-18 16:21:06 UTC (rev 4562)
@@ -153,8 +153,8 @@
if !APPBUNDLE

nobase_dist_pkgdata_DATA = $(TMP_ui)
-AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
+AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -Wno-non-virtual-dtor -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
+AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -Wno-non-virtual-dtor -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include

# Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
@@ -164,8 +164,8 @@
else

nobase_dist_data_DATA = $(TMP_ui)
-AM_CXXFLAGS = -Wall -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
-AM_CPPFLAGS = -Wall -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
+AM_CXXFLAGS = -Wall -Wno-non-virtual-dtor -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
+AM_CPPFLAGS = -Wall -Wno-non-virtual-dtor -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
AM_CFLAGS = -Wall -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
install-exec-hook:
cd $(bindir) ;\

Modified: trunk/pgadmin3/xtra/pgagent/Makefile.am
===================================================================
--- trunk/pgadmin3/xtra/pgagent/Makefile.am 2005-10-18 08:52:29 UTC (rev 4561)
+++ trunk/pgadmin3/xtra/pgagent/Makefile.am 2005-10-18 16:21:06 UTC (rev 4562)
@@ -33,8 +33,8 @@

if !APPBUNDLE

-AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -I$(srcdir)/include
-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -I$(srcdir)/include
+AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -Wno-non-virtual-dtor -I$(srcdir)/include
+AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -Wno-non-virtual-dtor -I$(srcdir)/include
AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -I$(srcdir)/include

# Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
@@ -43,8 +43,8 @@

else

-AM_CXXFLAGS = -Wall -I$(srcdir)/include
-AM_CPPFLAGS = -Wall -I$(srcdir)/include
+AM_CXXFLAGS = -Wall -Wno-non-virtual-dtor -I$(srcdir)/include
+AM_CPPFLAGS = -Wall -Wno-non-virtual-dtor -I$(srcdir)/include
AM_CFLAGS = -Wall -I$(srcdir)/include
install-exec-hook:
cd $(bindir) ;\