Log Message:
-----------
Dave's great build system shuffle, part deux
Modified Files:
--------------
pgadmin3:
Makefile.am (r1.39 -> r1.40)
configure.ac (r1.36 -> r1.37)
pgadmin3/src:
Makefile.am (r1.104 -> r1.105)
Added Files:
-----------
pgadmin3/xtra:
Makefile.am (r1.1)
pgadmin3/xtra/pgagent:
Makefile.am (r1.1)
Index: configure.ac
===================================================================
RCS file: /projects/pgadmin3/configure.ac,v
retrieving revision 1.36
retrieving revision 1.37
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.36 -r1.37
--- configure.ac
+++ configure.ac
@@ -49,5 +49,7 @@
pkg/redhat/Makefile
pkg/slackware/Makefile
pkg/src/Makefile
- pkg/win32/Makefile])
+ pkg/win32/Makefile
+ xtra/Makefile
+ xtra/pgagent/Makefile])
AC_OUTPUT
Index: Makefile.am
===================================================================
RCS file: /projects/pgadmin3/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -LMakefile.am -LMakefile.am -u -w -r1.39 -r1.40
--- Makefile.am
+++ Makefile.am
@@ -3,7 +3,9 @@
# This software is released under the Artistic Licence
#
# Makefile - Makefile for *nix systems
-SUBDIRS = src pkg
+
+SUBDIRS = src pkg xtra
+
EXTRA_DIST = \
$(top_srcdir)/README.txt \
$(top_srcdir)/BUGS.txt \
@@ -12,8 +14,10 @@
TMP_docs = \
$(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/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
if !APPBUNDLE
Index: Makefile.am
===================================================================
RCS file: /projects/pgadmin3/src/Makefile.am,v
retrieving revision 1.104
retrieving revision 1.105
diff -Lsrc/Makefile.am -Lsrc/Makefile.am -u -w -r1.104 -r1.105
--- src/Makefile.am
+++ src/Makefile.am
@@ -112,7 +112,8 @@
$(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
$(srcdir)/slony/include/slFunctions.h
+$(srcdir)/slony/include/dlgRepSubscription.h
$(srcdir)/slony/include/dlgRepProperty.h \
+$(srcdir)/slony/include/dlgRepTable.h $(srcdir)/slony/include/slFunctions.h
EXTRA_DIST = $(srcdir)/pgAdmin3.dsp $(srcdir)/pgAdmin3.dsw \
--- /dev/null
+++ xtra/Makefile.am
@@ -0,0 +1,18 @@
+# pgAdmin III - PostgreSQL Tools
+# Copyright (C) 2002 - 2005, The pgAdmin Development Team
+# This software is released under the Artistic Licence
+#
+# Makefile - Makefile for *nix systems
+
+SUBDIRS = pgagent
+
+# Note: We cannot add a Makefile to the admin directory as it already
+# contains one to be used as part of the PostreSQL contrib build
+# system. Instead, we'll add the files in that directory here.
+
+EXTRA_DIST = \
+ $(srcdir)/admin/Makefile \
+ $(srcdir)/admin/README.admin \
+ $(srcdir)/admin/admin.sql.in \
+ $(srcdir)/admin/genfile.c \
+ $(srcdir)/admin/misc.c
--- /dev/null
+++ xtra/pgagent/Makefile.am
@@ -0,0 +1,26 @@
+# pgAdmin III - PostgreSQL Tools
+# Copyright (C) 2002 - 2005, The pgAdmin Development Team
+# This software is released under the Artistic Licence
+#
+# Makefile - Makefile for *nix systems
+
+# Note: At the moment this doesn't build anything - it just includes
+# the files until Dave ports pgAgent to *nix.
+
+EXTRA_DIST = \
+ $(srcdir)/connection.cpp \
+ $(srcdir)/job.cpp \
+ $(srcdir)/misc.cpp
+ $(srcdir)/pgAgent.cpp \
+ $(srcdir)/precomp.cpp \
+ $(srcdir)/win32.cpp \
+ $(srcdir)/pgAgent.dsp \
+ $(srcdir)/pgAgent.dsw \
+ $(srcdir)/pgAgent.rc \
+ $(srcdir)/pgagent.sql
+
+noinst_HEADERS = \
+ $(srcdir)/include/connection.h \
+ $(srcdir)/include/job.h \
+ $(srcdir)/include/misc.h \
+ $(srcdir)/include/pgAgent.h
---------------------------(end of broadcast)---------------------------
TIP 5: Have you checked our extensive FAQ?
http://www.postgresql.org/docs/faq
