Index: Makefile.am
===================================================================
RCS file: /projects/pgadmin3/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -LMakefile.am -LMakefile.am -u -w -r1.33 -r1.34
--- Makefile.am
+++ Makefile.am
@@ -4,25 +4,27 @@
 #
 # Makefile - Makefile for *nix systems
 SUBDIRS = src
-EXTRA_DIST = 	README.txt BUGS.txt LICENCE.txt \
-		pkg/pgadmin3.desktop \
-		pkg/debian/rules pkg/debian/README.Debian \
-		pkg/debian/docs pkg/debian/dirs \
-		pkg/debian/copyright pkg/debian/control \
-		pkg/debian/changelog pkg/debian/make-deb \
-		pkg/debian/pgadmin3.menu \
-		pkg/fc1/pgadmin3.spec \
-		pkg/redhat/pgadmin3.spec \
-		pkg/slackware/build-release \
-		pkg/slackware/build-snapshot \
-		pkg/src/build-tarball \
-		pkg/win32/screen.bmp pkg/win32/banner.bmp \
-		pkg/win32/licence.rtf pkg/win32/pgadmin3.wsi
+EXTRA_DIST = 	$(top_srcdir)/README.txt $(top_srcdir)/BUGS.txt $(top_srcdir)/LICENCE.txt \
+		$(top_srcdir)/pkg/pgadmin3.desktop \
+		$(top_srcdir)/pkg/debian/rules pkg/debian/README.Debian \
+		$(top_srcdir)/pkg/debian/docs pkg/debian/dirs \
+		$(top_srcdir)/pkg/debian/copyright pkg/debian/control \
+		$(top_srcdir)/pkg/debian/changelog pkg/debian/make-deb \
+		$(top_srcdir)/pkg/debian/pgadmin3.menu \
+		$(top_srcdir)/pkg/fc1/pgadmin3.spec \
+		$(top_srcdir)/pkg/mandrake/pgadmin3.spec \
+		$(top_srcdir)/pkg/redhat/pgadmin3.spec \
+		$(top_srcdir)/pkg/slackware/build-release \
+		$(top_srcdir)/pkg/slackware/build-snapshot \
+		$(top_srcdir)/pkg/src/build-tarball \
+		$(top_srcdir)/pkg/win32/screen.bmp $(top_srcdir)/pkg/win32/banner.bmp \
+		$(top_srcdir)/pkg/win32/licence.rtf $(top_srcdir)/pkg/win32/pgadmin3.wsi
 
 nobase_dist_pkgdata_DATA = \
-		docs/en_US/pg/*.html \
-		docs/en_US/pg/*.css \
-		docs/en_US/images/*.png docs/en_US/*.html \
-		docs/en_US/*.css docs/en_US/pgadmin3.hh* \
-		docs/en_US/tips.txt
+		$(top_srcdir)/docs/en_US/pg/*.html \
+		$(top_srcdir)/docs/en_US/pg/*.css \
+		$(top_srcdir)/docs/en_US/images/*.png $(top_srcdir)/docs/en_US/*.html \
+		$(top_srcdir)/docs/en_US/*.css $(top_srcdir)/docs/en_US/pgadmin3.hh* \
+		$(top_srcdir)/docs/en_US/tips.txt
+
 
Index: Makefile.am
===================================================================
RCS file: /projects/pgadmin3/src/Makefile.am,v
retrieving revision 1.98
retrieving revision 1.99
diff -Lsrc/Makefile.am -Lsrc/Makefile.am -u -w -r1.98 -r1.99
--- src/Makefile.am
+++ src/Makefile.am
@@ -10,137 +10,135 @@
 
 bin_PROGRAMS = pgadmin3
 
-#  db/keywords.c  needs to be added
-
-pgadmin3_SOURCES = pgAdmin3.cpp \
-db/pgConn.cpp db/pgSet.cpp db/keywords.c \
-schema/pgAggregate.cpp schema/pgCast.cpp \
-schema/pgCheck.cpp schema/pgCollection.cpp \
-schema/pgColumn.cpp schema/pgConstraints.cpp \
-schema/pgConversion.cpp schema/pgDatabase.cpp \
-schema/pgDomain.cpp schema/pgForeignKey.cpp \
-schema/pgFunction.cpp schema/pgGroup.cpp \
-schema/pgIndex.cpp schema/pgIndexConstraint.cpp \
-schema/pgLanguage.cpp schema/pgObject.cpp \
-schema/pgOperator.cpp schema/pgOperatorClass.cpp \
-schema/pgRule.cpp schema/pgSchema.cpp \
-schema/pgSequence.cpp schema/pgServer.cpp \
-schema/pgTable.cpp schema/pgTablespace.cpp schema/pgTrigger.cpp \
-schema/pgType.cpp schema/pgUser.cpp schema/pgView.cpp \
-schema/pgDatatype.cpp \
-agent/pgaAgent.cpp agent/pgaJob.cpp \
-agent/pgaStep.cpp agent/pgaSchedule.cpp \
-agent/dlgJob.cpp agent/dlgSchedule.cpp agent/dlgStep.cpp \
-ui/xh_sqlbox.cpp ui/xh_calb.cpp ui/xh_timespin.cpp ui/xh_ctlcombo.cpp \
-ui/ctlSecurityPanel.cpp ui/dlgClasses.cpp ui/ctlComboBox.cpp \
-ui/calbox.cpp ui/timespin.cpp ui/ctlListView.cpp \
-ui/ctlSQLBox.cpp ui/ctlSQLResult.cpp ui/frmExport.cpp \
-ui/dlgEditGridOptions.cpp ui/events.cpp ui/frmAbout.cpp \
-ui/frmIndexcheck.cpp ui/dlgConnect.cpp ui/frmMain.cpp \
-ui/frmOptions.cpp ui/frmPassword.cpp ui/frmQuery.cpp \
-ui/frmHelp.cpp ui/frmSplash.cpp ui/frmMaintenance.cpp \
-ui/frmBackup.cpp ui/frmRestore.cpp ui/frmGrantWizard.cpp \
-ui/frmEditGrid.cpp ui/dlgProperty.cpp ui/dlgUser.cpp \
-ui/dlgServer.cpp ui/dlgGroup.cpp ui/dlgDatabase.cpp ui/dlgLanguage.cpp \
-ui/dlgSchema.cpp ui/dlgDomain.cpp ui/dlgTable.cpp ui/dlgTablespace.cpp \
-ui/dlgColumn.cpp ui/dlgIndex.cpp ui/dlgFunction.cpp \
-ui/dlgView.cpp ui/dlgRule.cpp ui/dlgOperator.cpp \
-ui/dlgAggregate.cpp ui/dlgCast.cpp ui/dlgConversion.cpp \
-ui/dlgIndexConstraint.cpp ui/dlgForeignKey.cpp \
-ui/dlgSequence.cpp ui/dlgTrigger.cpp ui/dlgType.cpp \
-ui/dlgCheck.cpp ui/frmStatus.cpp utils/misc.cpp \
-ui/dlgHbaConfig.cpp ui/dlgMainConfig.cpp ui/frmUpdate.cpp \
-ui/frmConfig.cpp ui/frmHbaConfig.cpp ui/frmMainConfig.cpp ui/frmHint.cpp \
-utils/sysLogger.cpp utils/sysSettings.cpp utils/sysProcess.cpp \
-utils/utffile.cpp utils/pgconfig.cpp utils/update.cpp \
-slony/slObject.cpp slony/slCluster.cpp slony/slNode.cpp \
-slony/slPath.cpp slony/slListen.cpp slony/slSet.cpp \
-slony/slSequence.cpp slony/slTable.cpp slony/slSubscription.cpp \
-slony/dlgRepCluster.cpp slony/dlgRepNode.cpp slony/dlgRepListen.cpp \
-slony/dlgRepPath.cpp slony/dlgRepSet.cpp slony/dlgRepSequence.cpp \
-slony/dlgRepTable.cpp slony/dlgRepSubscription.cpp \
-ui/common/xrcDialogs.cpp
-
-noinst_HEADERS = include/copyright.h include/version.h include/ctlSQLBox.h \
-include/ctlSQLResult.h include/ctlListView.h \
-include/parser/parse.h include/parser/keywords.h include/nodes/parsenodes.h \
-include/postgres.h include/pgDefs.h include/pgDatatype.h \
-include/ctlSecurityPanel.h include/dlgClasses.h include/frmGrantWizard.h \
-include/dlgCheck.h include/dlgColumn.h include/dlgServer.h \
-include/dlgDatabase.h include/dlgDomain.h include/frmExport.h \
-include/dlgForeignKey.h include/dlgFunction.h include/dlgGroup.h \
-include/dlgIndexConstraint.h include/dlgIndex.h \
-include/dlgLanguage.h include/dlgProperty.h include/dlgType.h \
-include/dlgView.h include/dlgRule.h include/dlgOperator.h \
-include/dlgAggregate.h include/dlgCast.h include/dlgConversion.h \
-include/dlgSequence.h include/dlgSchema.h include/dlgTable.h include/dlgTablespace.h \
-include/dlgOperator.h include/dlgView.h include/dlgRule.h \
-include/dlgTrigger.h include/dlgUser.h include/frmAbout.h \
-include/dlgConnect.h include/frmHelp.h \
-include/frmEditGrid.h include/dlgEditGridOptions.h include/frmMain.h \
-include/frmOptions.h include/frmPassword.h include/frmIndexcheck.h \
-include/frmQuery.h include/frmSplash.h \
-include/frmStatus.h include/frmMaintenance.h \
-include/frmBackup.h include/frmRestore.h \
-include/misc.h include/pgfeatures.h include/pgAdmin3.h include/pgAggregate.h \
-include/pgCast.h include/pgCheck.h include/pgCollection.h \
-include/pgColumn.h include/pgConn.h include/pgTablespace.h \
-include/pgConstraints.h include/pgConversion.h \
-include/pgDatabase.h include/pgDomain.h \
-include/pgForeignKey.h include/pgFunction.h \
-include/pgGroup.h include/pgIndexConstraint.h \
-include/pgIndex.h include/pgLanguage.h include/pgObject.h \
-include/pgOperatorClass.h include/pgOperator.h \
-include/pgRule.h include/pgSchema.h include/pgSequence.h \
-include/pgServer.h include/pgSet.h include/pgTable.h \
-include/pgTrigger.h include/pgType.h include/pgUser.h \
-include/pgView.h include/sysLogger.h include/utffile.h \
-include/calbox.h include/timespin.h include/ctlComboBox.h \
-include/xh_timespin.h include/xh_calb.h include/xh_sqlbox.h include/xh_ctlcombo.h \
-include/sysSettings.h include/sysProcess.h include/wxgridsel.h include/menu.h\
-include/pgconfig.h include/update.h include/frmUpdate.h \
-include/dlgHbaConfig.h include/dlgMainConfig.h include/frmHint.h \
-include/frmConfig.h include/frmHbaConfig.h include/frmMainConfig.h \
-agent/include/pgaAgent.h agent/include/pgaJob.h \
-agent/include/pgaStep.h agent/include/pgaSchedule.h \
-agent/include/dlgJob.h agent/include/dlgStep.h \
-agent/include/dlgSchedule.h slony/include/slObject.h \
-slony/include/slCluster.h slony/include/slNode.h \
-slony/include/slPath.h slony/include/slListen.h \
-slony/include/slSet.h slony/include/slSequence.h \
-slony/include/slTable.h slony/include/slSubscription.h \
-slony/include/dlgRepCluster.h slony/include/dlgRepNode.h \
-slony/include/dlgRepListen.h slony/include/dlgRepPath.h \
-slony/include/dlgRepSet.h slony/include/dlgRepSequence.h \
-slony/include/dlgRepSubscription.h 
-
-  
-EXTRA_DIST = pgAdmin3.dsp pgAdmin3.dsw \
-include/images/*.xpm \
-include/images/pgAdmin3.ico \
-ui/af_ZA/pgadmin3.po \
-ui/ar_SA/pgadmin3.po \
-ui/ca_ES/pgadmin3.po \
-ui/da_DK/pgadmin3.po \
-ui/de_DE/pgadmin3.po \
-ui/es_ES/pgadmin3.po \
-ui/fi_FI/pgadmin3.po \
-ui/fr_FR/pgadmin3.po \
-ui/hu_HU/pgadmin3.po \
-ui/id_ID/pgadmin3.po \
-ui/it_IT/pgadmin3.po \
-ui/ja_JP/pgadmin3.po \
-ui/lv_LV/pgadmin3.po \
-ui/nl_NL/pgadmin3.po \
-ui/pl_PL/pgadmin3.po \
-ui/pt_PT/pgadmin3.po \
-ui/ru_RU/pgadmin3.po \
-ui/sk_SK/pgadmin3.po \
-ui/sl_SI/pgadmin3.po \
-ui/sr_YU/pgadmin3.po \
-ui/tr_TR/pgadmin3.po \
-ui/zh_CN/pgadmin3.po \
-ui/zh_TW/pgadmin3.po
+pgadmin3_SOURCES = $(srcdir)/pgAdmin3.cpp \
+$(srcdir)/db/pgConn.cpp $(srcdir)/db/pgSet.cpp $(srcdir)/db/keywords.c \
+$(srcdir)/schema/pgAggregate.cpp $(srcdir)/schema/pgCast.cpp \
+$(srcdir)/schema/pgCheck.cpp $(srcdir)/schema/pgCollection.cpp \
+$(srcdir)/schema/pgColumn.cpp $(srcdir)/schema/pgConstraints.cpp \
+$(srcdir)/schema/pgConversion.cpp $(srcdir)/schema/pgDatabase.cpp \
+$(srcdir)/schema/pgDomain.cpp $(srcdir)/schema/pgForeignKey.cpp \
+$(srcdir)/schema/pgFunction.cpp $(srcdir)/schema/pgGroup.cpp \
+$(srcdir)/schema/pgIndex.cpp $(srcdir)/schema/pgIndexConstraint.cpp \
+$(srcdir)/schema/pgLanguage.cpp $(srcdir)/schema/pgObject.cpp \
+$(srcdir)/schema/pgOperator.cpp $(srcdir)/schema/pgOperatorClass.cpp \
+$(srcdir)/schema/pgRule.cpp $(srcdir)/schema/pgSchema.cpp \
+$(srcdir)/schema/pgSequence.cpp $(srcdir)/schema/pgServer.cpp \
+$(srcdir)/schema/pgTable.cpp $(srcdir)/schema/pgTablespace.cpp $(srcdir)/schema/pgTrigger.cpp \
+$(srcdir)/schema/pgType.cpp $(srcdir)/schema/pgUser.cpp $(srcdir)/schema/pgView.cpp \
+$(srcdir)/schema/pgDatatype.cpp \
+$(srcdir)/agent/pgaAgent.cpp $(srcdir)/agent/pgaJob.cpp \
+$(srcdir)/agent/pgaStep.cpp $(srcdir)/agent/pgaSchedule.cpp \
+$(srcdir)/agent/dlgJob.cpp $(srcdir)/agent/dlgSchedule.cpp $(srcdir)/agent/dlgStep.cpp \
+$(srcdir)/ui/xh_sqlbox.cpp $(srcdir)/ui/xh_calb.cpp $(srcdir)/ui/xh_timespin.cpp $(srcdir)/ui/xh_ctlcombo.cpp \
+$(srcdir)/ui/ctlSecurityPanel.cpp $(srcdir)/ui/dlgClasses.cpp $(srcdir)/ui/ctlComboBox.cpp \
+$(srcdir)/ui/calbox.cpp $(srcdir)/ui/timespin.cpp $(srcdir)/ui/ctlListView.cpp \
+$(srcdir)/ui/ctlSQLBox.cpp $(srcdir)/ui/ctlSQLResult.cpp $(srcdir)/ui/frmExport.cpp \
+$(srcdir)/ui/dlgEditGridOptions.cpp $(srcdir)/ui/events.cpp $(srcdir)/ui/frmAbout.cpp \
+$(srcdir)/ui/frmIndexcheck.cpp $(srcdir)/ui/dlgConnect.cpp $(srcdir)/ui/frmMain.cpp \
+$(srcdir)/ui/frmOptions.cpp $(srcdir)/ui/frmPassword.cpp $(srcdir)/ui/frmQuery.cpp \
+$(srcdir)/ui/frmHelp.cpp $(srcdir)/ui/frmSplash.cpp $(srcdir)/ui/frmMaintenance.cpp \
+$(srcdir)/ui/frmBackup.cpp $(srcdir)/ui/frmRestore.cpp $(srcdir)/ui/frmGrantWizard.cpp \
+$(srcdir)/ui/frmEditGrid.cpp $(srcdir)/ui/dlgProperty.cpp $(srcdir)/ui/dlgUser.cpp \
+$(srcdir)/ui/dlgServer.cpp $(srcdir)/ui/dlgGroup.cpp $(srcdir)/ui/dlgDatabase.cpp $(srcdir)/ui/dlgLanguage.cpp \
+$(srcdir)/ui/dlgSchema.cpp $(srcdir)/ui/dlgDomain.cpp $(srcdir)/ui/dlgTable.cpp $(srcdir)/ui/dlgTablespace.cpp \
+$(srcdir)/ui/dlgColumn.cpp $(srcdir)/ui/dlgIndex.cpp $(srcdir)/ui/dlgFunction.cpp \
+$(srcdir)/ui/dlgView.cpp $(srcdir)/ui/dlgRule.cpp $(srcdir)/ui/dlgOperator.cpp \
+$(srcdir)/ui/dlgAggregate.cpp $(srcdir)/ui/dlgCast.cpp $(srcdir)/ui/dlgConversion.cpp \
+$(srcdir)/ui/dlgIndexConstraint.cpp $(srcdir)/ui/dlgForeignKey.cpp \
+$(srcdir)/ui/dlgSequence.cpp $(srcdir)/ui/dlgTrigger.cpp $(srcdir)/ui/dlgType.cpp \
+$(srcdir)/ui/dlgCheck.cpp $(srcdir)/ui/frmStatus.cpp utils/misc.cpp \
+$(srcdir)/ui/dlgHbaConfig.cpp $(srcdir)/ui/dlgMainConfig.cpp $(srcdir)/ui/frmUpdate.cpp \
+$(srcdir)/ui/frmConfig.cpp $(srcdir)/ui/frmHbaConfig.cpp $(srcdir)/ui/frmMainConfig.cpp $(srcdir)/ui/frmHint.cpp \
+$(srcdir)/utils/sysLogger.cpp $(srcdir)/utils/sysSettings.cpp $(srcdir)/utils/sysProcess.cpp \
+$(srcdir)/utils/utffile.cpp $(srcdir)/utils/pgconfig.cpp $(srcdir)/utils/update.cpp \
+$(srcdir)/slony/slObject.cpp $(srcdir)/slony/slCluster.cpp $(srcdir)/slony/slNode.cpp \
+$(srcdir)/slony/slPath.cpp $(srcdir)/slony/slListen.cpp $(srcdir)/slony/slSet.cpp \
+$(srcdir)/slony/slSequence.cpp $(srcdir)/slony/slTable.cpp $(srcdir)/slony/slSubscription.cpp \
+$(srcdir)/slony/dlgRepCluster.cpp $(srcdir)/slony/dlgRepNode.cpp $(srcdir)/slony/dlgRepListen.cpp \
+$(srcdir)/slony/dlgRepPath.cpp $(srcdir)/slony/dlgRepSet.cpp $(srcdir)/slony/dlgRepSequence.cpp \
+$(srcdir)/slony/dlgRepTable.cpp $(srcdir)/slony/dlgRepSubscription.cpp \
+$(srcdir)/ui/common/xrcDialogs.cpp
+
+noinst_HEADERS = $(srcdir)/include/copyright.h $(srcdir)/include/version.h $(srcdir)/include/ctlSQLBox.h \
+$(srcdir)/include/ctlSQLResult.h $(srcdir)/include/ctlListView.h \
+$(srcdir)/include/parser/parse.h $(srcdir)/include/parser/keywords.h $(srcdir)/include/nodes/parsenodes.h \
+$(srcdir)/include/postgres.h $(srcdir)/include/pgDefs.h $(srcdir)/include/pgDatatype.h \
+$(srcdir)/include/ctlSecurityPanel.h $(srcdir)/include/dlgClasses.h $(srcdir)/include/frmGrantWizard.h \
+$(srcdir)/include/dlgCheck.h $(srcdir)/include/dlgColumn.h $(srcdir)/include/dlgServer.h \
+$(srcdir)/include/dlgDatabase.h $(srcdir)/include/dlgDomain.h $(srcdir)/include/frmExport.h \
+$(srcdir)/include/dlgForeignKey.h $(srcdir)/include/dlgFunction.h $(srcdir)/include/dlgGroup.h \
+$(srcdir)/include/dlgIndexConstraint.h $(srcdir)/include/dlgIndex.h \
+$(srcdir)/include/dlgLanguage.h $(srcdir)/include/dlgProperty.h $(srcdir)/include/dlgType.h \
+$(srcdir)/include/dlgView.h $(srcdir)/include/dlgRule.h $(srcdir)/include/dlgOperator.h \
+$(srcdir)/include/dlgAggregate.h $(srcdir)/include/dlgCast.h $(srcdir)/include/dlgConversion.h \
+$(srcdir)/include/dlgSequence.h $(srcdir)/include/dlgSchema.h $(srcdir)/include/dlgTable.h $(srcdir)/include/dlgTablespace.h \
+$(srcdir)/include/dlgOperator.h $(srcdir)/include/dlgView.h $(srcdir)/include/dlgRule.h \
+$(srcdir)/include/dlgTrigger.h $(srcdir)/include/dlgUser.h $(srcdir)/include/frmAbout.h \
+$(srcdir)/include/dlgConnect.h $(srcdir)/include/frmHelp.h \
+$(srcdir)/include/frmEditGrid.h $(srcdir)/include/dlgEditGridOptions.h $(srcdir)/include/frmMain.h \
+$(srcdir)/include/frmOptions.h $(srcdir)/include/frmPassword.h $(srcdir)/include/frmIndexcheck.h \
+$(srcdir)/include/frmQuery.h $(srcdir)/include/frmSplash.h \
+$(srcdir)/include/frmStatus.h $(srcdir)/include/frmMaintenance.h \
+$(srcdir)/include/frmBackup.h $(srcdir)/include/frmRestore.h \
+$(srcdir)/include/misc.h $(srcdir)/include/pgfeatures.h $(srcdir)/include/pgAdmin3.h $(srcdir)/include/pgAggregate.h \
+$(srcdir)/include/pgCast.h $(srcdir)/include/pgCheck.h $(srcdir)/include/pgCollection.h \
+$(srcdir)/include/pgColumn.h $(srcdir)/include/pgConn.h $(srcdir)/include/pgTablespace.h \
+$(srcdir)/include/pgConstraints.h $(srcdir)/include/pgConversion.h \
+$(srcdir)/include/pgDatabase.h $(srcdir)/include/pgDomain.h \
+$(srcdir)/include/pgForeignKey.h $(srcdir)/include/pgFunction.h \
+$(srcdir)/include/pgGroup.h $(srcdir)/include/pgIndexConstraint.h \
+$(srcdir)/include/pgIndex.h $(srcdir)/include/pgLanguage.h $(srcdir)/include/pgObject.h \
+$(srcdir)/include/pgOperatorClass.h $(srcdir)/include/pgOperator.h \
+$(srcdir)/include/pgRule.h $(srcdir)/include/pgSchema.h $(srcdir)/include/pgSequence.h \
+$(srcdir)/include/pgServer.h $(srcdir)/include/pgSet.h $(srcdir)/include/pgTable.h \
+$(srcdir)/include/pgTrigger.h $(srcdir)/include/pgType.h $(srcdir)/include/pgUser.h \
+$(srcdir)/include/pgView.h $(srcdir)/include/sysLogger.h $(srcdir)/include/utffile.h \
+$(srcdir)/include/calbox.h $(srcdir)/include/timespin.h $(srcdir)/include/ctlComboBox.h \
+$(srcdir)/include/xh_timespin.h $(srcdir)/include/xh_calb.h $(srcdir)/include/xh_sqlbox.h $(srcdir)/include/xh_ctlcombo.h \
+$(srcdir)/include/sysSettings.h $(srcdir)/include/sysProcess.h $(srcdir)/include/wxgridsel.h $(srcdir)/include/menu.h\
+$(srcdir)/include/pgconfig.h $(srcdir)/include/update.h $(srcdir)/include/frmUpdate.h \
+$(srcdir)/include/dlgHbaConfig.h $(srcdir)/include/dlgMainConfig.h $(srcdir)/include/frmHint.h \
+$(srcdir)/include/frmConfig.h $(srcdir)/include/frmHbaConfig.h $(srcdir)/include/frmMainConfig.h \
+$(srcdir)/agent/include/pgaAgent.h $(srcdir)/agent/include/pgaJob.h \
+$(srcdir)/agent/include/pgaStep.h $(srcdir)/agent/include/pgaSchedule.h \
+$(srcdir)/agent/include/dlgJob.h $(srcdir)/agent/include/dlgStep.h \
+$(srcdir)/agent/include/dlgSchedule.h $(srcdir)/slony/include/slObject.h \
+$(srcdir)/slony/include/slCluster.h $(srcdir)/slony/include/slNode.h \
+$(srcdir)/slony/include/slPath.h $(srcdir)/slony/include/slListen.h \
+$(srcdir)/slony/include/slSet.h $(srcdir)/slony/include/slSequence.h \
+$(srcdir)/slony/include/slTable.h $(srcdir)/slony/include/slSubscription.h \
+$(srcdir)/slony/include/dlgRepCluster.h $(srcdir)/slony/include/dlgRepNode.h \
+$(srcdir)/slony/include/dlgRepListen.h $(srcdir)/slony/include/dlgRepPath.h \
+$(srcdir)/slony/include/dlgRepSet.h $(srcdir)/slony/include/dlgRepSequence.h \
+$(srcdir)/slony/include/dlgRepSubscription.h 
+
+  
+EXTRA_DIST = $(srcdir)/pgAdmin3.dsp $(srcdir)/pgAdmin3.dsw \
+$(srcdir)/include/images/*.xpm \
+$(srcdir)/include/images/pgAdmin3.ico \
+$(srcdir)/ui/af_ZA/pgadmin3.po \
+$(srcdir)/ui/ar_SA/pgadmin3.po \
+$(srcdir)/ui/ca_ES/pgadmin3.po \
+$(srcdir)/ui/da_DK/pgadmin3.po \
+$(srcdir)/ui/de_DE/pgadmin3.po \
+$(srcdir)/ui/es_ES/pgadmin3.po \
+$(srcdir)/ui/fi_FI/pgadmin3.po \
+$(srcdir)/ui/fr_FR/pgadmin3.po \
+$(srcdir)/ui/hu_HU/pgadmin3.po \
+$(srcdir)/ui/id_ID/pgadmin3.po \
+$(srcdir)/ui/it_IT/pgadmin3.po \
+$(srcdir)/ui/ja_JP/pgadmin3.po \
+$(srcdir)/ui/lv_LV/pgadmin3.po \
+$(srcdir)/ui/nl_NL/pgadmin3.po \
+$(srcdir)/ui/pl_PL/pgadmin3.po \
+$(srcdir)/ui/pt_PT/pgadmin3.po \
+$(srcdir)/ui/ru_RU/pgadmin3.po \
+$(srcdir)/ui/sk_SK/pgadmin3.po \
+$(srcdir)/ui/sl_SI/pgadmin3.po \
+$(srcdir)/ui/sr_YU/pgadmin3.po \
+$(srcdir)/ui/tr_TR/pgadmin3.po \
+$(srcdir)/ui/zh_CN/pgadmin3.po \
+$(srcdir)/ui/zh_TW/pgadmin3.po
 
 ##############################################################################
 #
@@ -150,52 +148,53 @@
 #
 ##############################################################################
 
-nobase_dist_pkgdata_DATA = ui/common/*.xrc \
-ui/wxstd.mo \
-ui/pgadmin3.lng \
-ui/pg_settings.csv \
-ui/af_ZA/pgadmin3.mo \
-ui/ar_SA/pgadmin3.mo \
-ui/ca_ES/pgadmin3.mo \
-ui/da_DK/pgadmin3.mo \
-ui/de_DE/pgadmin3.mo \
-ui/es_ES/pgadmin3.mo \
-ui/fi_FI/pgadmin3.mo \
-ui/fr_FR/pgadmin3.mo \
-ui/hu_HU/pgadmin3.mo \
-ui/id_ID/pgadmin3.mo \
-ui/it_IT/pgadmin3.mo \
-ui/ja_JP/pgadmin3.mo \
-ui/lv_LV/pgadmin3.mo \
-ui/nl_NL/pgadmin3.mo \
-ui/pl_PL/pgadmin3.mo \
-ui/pt_PT/pgadmin3.mo \
-ui/ru_RU/pgadmin3.mo \
-ui/sk_SK/pgadmin3.mo \
-ui/sl_SI/pgadmin3.mo \
-ui/sr_YU/pgadmin3.mo \
-ui/tr_TR/pgadmin3.mo \
-ui/zh_CN/pgadmin3.mo \
-ui/zh_TW/pgadmin3.mo \
-ui/af_ZA/wxstd.mo \
-ui/ca_ES/wxstd.mo \
-ui/da_DK/wxstd.mo \
-ui/de_DE/wxstd.mo \
-ui/es_ES/wxstd.mo \
-ui/fi_FI/wxstd.mo \
-ui/fr_FR/wxstd.mo \
-ui/hu_HU/wxstd.mo \
-ui/id_ID/wxstd.mo \
-ui/it_IT/wxstd.mo \
-ui/ja_JP/wxstd.mo \
-ui/nl_NL/wxstd.mo \
-ui/pl_PL/wxstd.mo \
-ui/ru_RU/wxstd.mo \
-ui/sl_SI/wxstd.mo \
-ui/tr_TR/wxstd.mo \
-ui/zh_CN/wxstd.mo \
-ui/zh_TW/wxstd.mo
+nobase_dist_pkgdata_DATA = $(srcdir)/ui/common/*.xrc \
+$(srcdir)/ui/wxstd.mo \
+$(srcdir)/ui/pgadmin3.lng \
+$(srcdir)/ui/pg_settings.csv \
+$(srcdir)/ui/af_ZA/pgadmin3.mo \
+$(srcdir)/ui/ar_SA/pgadmin3.mo \
+$(srcdir)/ui/ca_ES/pgadmin3.mo \
+$(srcdir)/ui/da_DK/pgadmin3.mo \
+$(srcdir)/ui/de_DE/pgadmin3.mo \
+$(srcdir)/ui/es_ES/pgadmin3.mo \
+$(srcdir)/ui/fi_FI/pgadmin3.mo \
+$(srcdir)/ui/fr_FR/pgadmin3.mo \
+$(srcdir)/ui/hu_HU/pgadmin3.mo \
+$(srcdir)/ui/id_ID/pgadmin3.mo \
+$(srcdir)/ui/it_IT/pgadmin3.mo \
+$(srcdir)/ui/ja_JP/pgadmin3.mo \
+$(srcdir)/ui/lv_LV/pgadmin3.mo \
+$(srcdir)/ui/nl_NL/pgadmin3.mo \
+$(srcdir)/ui/pl_PL/pgadmin3.mo \
+$(srcdir)/ui/pt_PT/pgadmin3.mo \
+$(srcdir)/ui/ru_RU/pgadmin3.mo \
+$(srcdir)/ui/sk_SK/pgadmin3.mo \
+$(srcdir)/ui/sl_SI/pgadmin3.mo \
+$(srcdir)/ui/sr_YU/pgadmin3.mo \
+$(srcdir)/ui/tr_TR/pgadmin3.mo \
+$(srcdir)/ui/zh_CN/pgadmin3.mo \
+$(srcdir)/ui/zh_TW/pgadmin3.mo \
+$(srcdir)/ui/af_ZA/wxstd.mo \
+$(srcdir)/ui/ca_ES/wxstd.mo \
+$(srcdir)/ui/da_DK/wxstd.mo \
+$(srcdir)/ui/de_DE/wxstd.mo \
+$(srcdir)/ui/es_ES/wxstd.mo \
+$(srcdir)/ui/fi_FI/wxstd.mo \
+$(srcdir)/ui/fr_FR/wxstd.mo \
+$(srcdir)/ui/hu_HU/wxstd.mo \
+$(srcdir)/ui/id_ID/wxstd.mo \
+$(srcdir)/ui/it_IT/wxstd.mo \
+$(srcdir)/ui/ja_JP/wxstd.mo \
+$(srcdir)/ui/nl_NL/wxstd.mo \
+$(srcdir)/ui/pl_PL/wxstd.mo \
+$(srcdir)/ui/ru_RU/wxstd.mo \
+$(srcdir)/ui/sl_SI/wxstd.mo \
+$(srcdir)/ui/tr_TR/wxstd.mo \
+$(srcdir)/ui/zh_CN/wxstd.mo \
+$(srcdir)/ui/zh_TW/wxstd.mo
 
 AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
 AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
 AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
+