Permalink
Browse files

Modify the automake build system to create object files alongside their

corresponding source files, instead of in the top level directory for
each sub-project. This allows us to have source code files with the
same name in different directories.
  • Loading branch information...
1 parent df1cd78 commit e7e2ea2715555fc19039630ad68fb0122b05b68f @asheshv asheshv committed with dpage Jul 18, 2012
Showing with 1,692 additions and 1,689 deletions.
  1. +1 −0 .gitignore
  2. +2 −1 configure.ac.in
  3. +30 −27 pgadmin/Makefile.am
  4. +7 −7 pgadmin/agent/module.mk
  5. +25 −25 pgadmin/ctl/module.mk
  6. +5 −5 pgadmin/db/module.mk
  7. +10 −10 pgadmin/dd/dditems/figures/module.mk
  8. +2 −2 pgadmin/dd/dditems/figures/xml/module.mk
  9. +7 −7 pgadmin/dd/dditems/handles/module.mk
  10. +7 −7 pgadmin/dd/dditems/locators/module.mk
  11. +6 −6 pgadmin/dd/dditems/module.mk
  12. +3 −3 pgadmin/dd/dditems/tools/module.mk
  13. +4 −4 pgadmin/dd/dditems/utilities/module.mk
  14. +8 −8 pgadmin/dd/ddmodel/module.mk
  15. +3 −3 pgadmin/dd/module.mk
  16. +16 −16 pgadmin/debugger/module.mk
  17. +54 −54 pgadmin/dlg/module.mk
  18. +26 −26 pgadmin/frm/module.mk
  19. +36 −36 pgadmin/gqb/module.mk
  20. +5 −5 pgadmin/hotdraw/connectors/module.mk
  21. +5 −5 pgadmin/hotdraw/figures/defaultAttributes/module.mk
  22. +16 −16 pgadmin/hotdraw/figures/module.mk
  23. +2 −2 pgadmin/hotdraw/figures/xml/module.mk
  24. +9 −9 pgadmin/hotdraw/handles/module.mk
  25. +3 −3 pgadmin/hotdraw/locators/module.mk
  26. +4 −4 pgadmin/hotdraw/main/module.mk
  27. +8 −8 pgadmin/hotdraw/module.mk
  28. +16 −16 pgadmin/hotdraw/tools/module.mk
  29. +10 −10 pgadmin/hotdraw/utilities/module.mk
  30. +7 −7 pgadmin/include/agent/module.mk
  31. +25 −25 pgadmin/include/ctl/module.mk
  32. +4 −4 pgadmin/include/db/module.mk
  33. +10 −10 pgadmin/include/dd/dditems/figures/module.mk
  34. +2 −2 pgadmin/include/dd/dditems/figures/xml/module.mk
  35. +7 −7 pgadmin/include/dd/dditems/handles/module.mk
  36. +7 −7 pgadmin/include/dd/dditems/locators/module.mk
  37. +6 −6 pgadmin/include/dd/dditems/module.mk
  38. +3 −3 pgadmin/include/dd/dditems/tools/module.mk
  39. +5 −5 pgadmin/include/dd/dditems/utilities/module.mk
  40. +8 −8 pgadmin/include/dd/ddmodel/module.mk
  41. +3 −3 pgadmin/include/dd/module.mk
  42. +18 −18 pgadmin/include/debugger/module.mk
  43. +54 −54 pgadmin/include/dlg/module.mk
  44. +40 −40 pgadmin/include/frm/module.mk
  45. +37 −37 pgadmin/include/gqb/module.mk
  46. +5 −5 pgadmin/include/hotdraw/connectors/module.mk
  47. +5 −5 pgadmin/include/hotdraw/figures/defaultAttributes/module.mk
  48. +16 −16 pgadmin/include/hotdraw/figures/module.mk
  49. +2 −2 pgadmin/include/hotdraw/figures/xml/module.mk
  50. +9 −9 pgadmin/include/hotdraw/handles/module.mk
  51. +3 −3 pgadmin/include/hotdraw/locators/module.mk
  52. +5 −5 pgadmin/include/hotdraw/main/module.mk
  53. +8 −8 pgadmin/include/hotdraw/module.mk
  54. +16 −16 pgadmin/include/hotdraw/tools/module.mk
  55. +11 −11 pgadmin/include/hotdraw/utilities/module.mk
  56. +300 −300 pgadmin/include/images/module.mk
  57. +23 −23 pgadmin/include/module.mk
  58. +17 −17 pgadmin/include/ogl/module.mk
  59. +2 −2 pgadmin/include/parser/module.mk
  60. +9 −9 pgadmin/include/pgscript/exceptions/module.mk
  61. +39 −39 pgadmin/include/pgscript/expressions/module.mk
  62. +12 −12 pgadmin/include/pgscript/generators/module.mk
  63. +14 −14 pgadmin/include/pgscript/module.mk
  64. +7 −7 pgadmin/include/pgscript/objects/module.mk
  65. +13 −13 pgadmin/include/pgscript/statements/module.mk
  66. +4 −4 pgadmin/include/pgscript/utilities/mapm-lib/module.mk
  67. +11 −11 pgadmin/include/pgscript/utilities/module.mk
  68. +66 −66 pgadmin/include/schema/module.mk
  69. +18 −18 pgadmin/include/slony/module.mk
  70. +14 −14 pgadmin/include/utils/module.mk
  71. +14 −14 pgadmin/ogl/module.mk
  72. +9 −9 pgadmin/pgscript/exceptions/module.mk
  73. +38 −38 pgadmin/pgscript/expressions/module.mk
  74. +12 −12 pgadmin/pgscript/generators/module.mk
  75. +14 −14 pgadmin/pgscript/module.mk
  76. +6 −6 pgadmin/pgscript/objects/module.mk
  77. +12 −12 pgadmin/pgscript/statements/module.mk
  78. +39 −39 pgadmin/pgscript/utilities/m_apm/module.mk
  79. +8 −8 pgadmin/pgscript/utilities/module.mk
  80. +51 −53 pgadmin/schema/module.mk
  81. +18 −18 pgadmin/slony/module.mk
  82. +83 −83 pgadmin/ui/module.mk
  83. +15 −15 pgadmin/utils/module.mk
  84. +2 −2 xtra/pgscript/bin/Makefile.am
  85. +145 −145 xtra/pgscript/lib/Makefile.am
  86. +27 −27 xtra/pgscript/test/Makefile.am
  87. +4 −4 xtra/png2c/Makefile.am
View
@@ -26,3 +26,4 @@ configure
configure.ac
Makefile
stamp-h1
+*/.dirstamp
View
@@ -6,12 +6,13 @@ AC_CONFIG_AUX_DIR(config)
AC_CONFIG_SRCDIR([pgadmin/pgAdmin3.cpp])
AM_CONFIG_HEADER([config.h])
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([tar-ustar])
+AM_INIT_AUTOMAKE([tar-ustar subdir-objects])
AC_PREFIX_DEFAULT([/usr/local/pgadmin3])
# Checks for programs.
AC_PROG_CC
AC_PROG_CXX
+AM_PROG_CC_C_O
AC_PROG_RANLIB
CHECK_CPP_COMPILER
CHECK_SUN_COMPILER
View
@@ -9,43 +9,46 @@
#
#######################################################################
+
+AUTOMAKE_OPTIONS = subdir-objects
+
bin_PROGRAMS = pgadmin3
pgadmin3_SOURCES = \
- $(srcdir)/pgAdmin3.cpp
+ pgAdmin3.cpp
EXTRA_DIST = \
- $(srcdir)/Makefile.deps \
- $(srcdir)/pgAdmin3.vcxproj \
- $(srcdir)/pgAdmin3.vcxproj.filters \
- $(srcdir)/precomp.cpp \
- $(srcdir)/pgAdmin3.rc \
- $(srcdir)/ver_svn.bat \
- $(srcdir)/ver_svn.sh
+ Makefile.deps \
+ pgAdmin3.vcxproj \
+ pgAdmin3.vcxproj.filters \
+ precomp.cpp \
+ pgAdmin3.rc \
+ ver_svn.bat \
+ ver_svn.sh
# Make sure we always have these dependencies, even if dependency tracking
# is turend off. The leading dash keeps automake from trying to process this.
-include Makefile.deps
-TMP_ui =
+TMP_ui =
# Include all the sub-Makefiles
-include $(srcdir)/agent/module.mk
-include $(srcdir)/ctl/module.mk
-include $(srcdir)/db/module.mk
-include $(srcdir)/dd/module.mk
-include $(srcdir)/debugger/module.mk
-include $(srcdir)/dlg/module.mk
-include $(srcdir)/frm/module.mk
-include $(srcdir)/include/module.mk
-include $(srcdir)/ogl/module.mk
-include $(srcdir)/pgscript/module.mk
-include $(srcdir)/schema/module.mk
-include $(srcdir)/slony/module.mk
-include $(srcdir)/gqb/module.mk
-include $(srcdir)/hotdraw/module.mk
-include $(srcdir)/ui/module.mk
-include $(srcdir)/utils/module.mk
+include agent/module.mk
+include ctl/module.mk
+include db/module.mk
+include dd/module.mk
+include debugger/module.mk
+include dlg/module.mk
+include frm/module.mk
+include include/module.mk
+include ogl/module.mk
+include pgscript/module.mk
+include schema/module.mk
+include slony/module.mk
+include gqb/module.mk
+include hotdraw/module.mk
+include ui/module.mk
+include utils/module.mk
if SUN_CC
__CFLAGS=""
@@ -68,7 +71,7 @@ endif
if !APPBUNDLE
nobase_dist_pkgdata_DATA = \
- $(srcdir)/settings.ini
+ $(top_srcdir)/pgadmin/settings.ini
if BUILD_DEBUG
@@ -85,7 +88,7 @@ install-exec-hook:
else
nobase_dist_data_DATA = \
- $(srcdir)/settings.ini
+ $(top_srcdir)/pgadmin/settings.ini
if BUILD_DEBUG
nobase_dist_data_DATA += \
View
@@ -10,14 +10,14 @@
#######################################################################
pgadmin3_SOURCES += \
- $(srcdir)/agent/dlgJob.cpp \
- $(srcdir)/agent/dlgSchedule.cpp \
- $(srcdir)/agent/dlgStep.cpp \
- $(srcdir)/agent/pgaJob.cpp \
- $(srcdir)/agent/pgaSchedule.cpp \
- $(srcdir)/agent/pgaStep.cpp
+ agent/dlgJob.cpp \
+ agent/dlgSchedule.cpp \
+ agent/dlgStep.cpp \
+ agent/pgaJob.cpp \
+ agent/pgaSchedule.cpp \
+ agent/pgaStep.cpp
EXTRA_DIST += \
- $(srcdir)/agent/module.mk
+ agent/module.mk
View
@@ -10,32 +10,32 @@
#######################################################################
pgadmin3_SOURCES += \
- $(srcdir)/ctl/calbox.cpp \
- $(srcdir)/ctl/ctlAuiNotebook.cpp \
- $(srcdir)/ctl/ctlCheckTreeView.cpp \
- $(srcdir)/ctl/ctlColourPicker.cpp \
- $(srcdir)/ctl/ctlComboBox.cpp \
- $(srcdir)/ctl/ctlListView.cpp \
- $(srcdir)/ctl/ctlMenuToolbar.cpp \
- $(srcdir)/ctl/ctlSQLBox.cpp \
- $(srcdir)/ctl/ctlSQLGrid.cpp \
- $(srcdir)/ctl/ctlSQLResult.cpp \
- $(srcdir)/ctl/ctlDefaultSecurityPanel.cpp \
- $(srcdir)/ctl/ctlSeclabelPanel.cpp \
- $(srcdir)/ctl/ctlSecurityPanel.cpp \
- $(srcdir)/ctl/ctlTree.cpp \
- $(srcdir)/ctl/explainCanvas.cpp \
- $(srcdir)/ctl/explainShape.cpp \
- $(srcdir)/ctl/timespin.cpp \
- $(srcdir)/ctl/xh_calb.cpp \
- $(srcdir)/ctl/xh_ctlcolourpicker.cpp \
- $(srcdir)/ctl/xh_ctlcombo.cpp \
- $(srcdir)/ctl/xh_ctlchecktreeview.cpp \
- $(srcdir)/ctl/xh_ctltree.cpp \
- $(srcdir)/ctl/xh_sqlbox.cpp \
- $(srcdir)/ctl/xh_timespin.cpp
+ ctl/calbox.cpp \
+ ctl/ctlAuiNotebook.cpp \
+ ctl/ctlCheckTreeView.cpp \
+ ctl/ctlColourPicker.cpp \
+ ctl/ctlComboBox.cpp \
+ ctl/ctlListView.cpp \
+ ctl/ctlMenuToolbar.cpp \
+ ctl/ctlSQLBox.cpp \
+ ctl/ctlSQLGrid.cpp \
+ ctl/ctlSQLResult.cpp \
+ ctl/ctlDefaultSecurityPanel.cpp \
+ ctl/ctlSeclabelPanel.cpp \
+ ctl/ctlSecurityPanel.cpp \
+ ctl/ctlTree.cpp \
+ ctl/explainCanvas.cpp \
+ ctl/explainShape.cpp \
+ ctl/timespin.cpp \
+ ctl/xh_calb.cpp \
+ ctl/xh_ctlcolourpicker.cpp \
+ ctl/xh_ctlcombo.cpp \
+ ctl/xh_ctlchecktreeview.cpp \
+ ctl/xh_ctltree.cpp \
+ ctl/xh_sqlbox.cpp \
+ ctl/xh_timespin.cpp
EXTRA_DIST += \
- $(srcdir)/ctl/module.mk
+ ctl/module.mk
View
@@ -10,11 +10,11 @@
#######################################################################
pgadmin3_SOURCES += \
- $(srcdir)/db/keywords.c \
- $(srcdir)/db/pgConn.cpp \
- $(srcdir)/db/pgSet.cpp \
- $(srcdir)/db/pgQueryThread.cpp
+ db/keywords.c \
+ db/pgConn.cpp \
+ db/pgSet.cpp \
+ db/pgQueryThread.cpp
EXTRA_DIST += \
- $(srcdir)/db/module.mk
+ db/module.mk
@@ -10,16 +10,16 @@
#######################################################################
pgadmin3_SOURCES += \
- $(srcdir)/dd/dditems/figures/ddColumnFigure.cpp \
- $(srcdir)/dd/dditems/figures/ddColumnKindIcon.cpp \
- $(srcdir)/dd/dditems/figures/ddColumnOptionIcon.cpp \
- $(srcdir)/dd/dditems/figures/ddRelationshipFigure.cpp \
- $(srcdir)/dd/dditems/figures/ddRelationshipItem.cpp \
- $(srcdir)/dd/dditems/figures/ddRelationshipTerminal.cpp \
- $(srcdir)/dd/dditems/figures/ddTableFigure.cpp \
- $(srcdir)/dd/dditems/figures/ddTextTableItemFigure.cpp
+ dd/dditems/figures/ddColumnFigure.cpp \
+ dd/dditems/figures/ddColumnKindIcon.cpp \
+ dd/dditems/figures/ddColumnOptionIcon.cpp \
+ dd/dditems/figures/ddRelationshipFigure.cpp \
+ dd/dditems/figures/ddRelationshipItem.cpp \
+ dd/dditems/figures/ddRelationshipTerminal.cpp \
+ dd/dditems/figures/ddTableFigure.cpp \
+ dd/dditems/figures/ddTextTableItemFigure.cpp
EXTRA_DIST += \
- $(srcdir)/dd/dditems/figures/module.mk
+ dd/dditems/figures/module.mk
-include $(srcdir)/dd/dditems/figures/xml/module.mk
+include dd/dditems/figures/xml/module.mk
@@ -10,7 +10,7 @@
#######################################################################
pgadmin3_SOURCES += \
- $(srcdir)/dd/dditems/figures/xml/ddXmlStorage.cpp
+ dd/dditems/figures/xml/ddXmlStorage.cpp
EXTRA_DIST += \
- $(srcdir)/dd/dditems/figures/xml/module.mk
+ dd/dditems/figures/xml/module.mk
@@ -10,12 +10,12 @@
#######################################################################
pgadmin3_SOURCES += \
- $(srcdir)/dd/dditems/handles/ddAddColButtonHandle.cpp \
- $(srcdir)/dd/dditems/handles/ddAddFkButtonHandle.cpp \
- $(srcdir)/dd/dditems/handles/ddMinMaxTableButtonHandle.cpp \
- $(srcdir)/dd/dditems/handles/ddRemoveTableButtonHandle.cpp \
- $(srcdir)/dd/dditems/handles/ddScrollBarHandle.cpp \
- $(srcdir)/dd/dditems/handles/ddSouthTableSizeHandle.cpp
+ dd/dditems/handles/ddAddColButtonHandle.cpp \
+ dd/dditems/handles/ddAddFkButtonHandle.cpp \
+ dd/dditems/handles/ddMinMaxTableButtonHandle.cpp \
+ dd/dditems/handles/ddRemoveTableButtonHandle.cpp \
+ dd/dditems/handles/ddScrollBarHandle.cpp \
+ dd/dditems/handles/ddSouthTableSizeHandle.cpp
EXTRA_DIST += \
- $(srcdir)/dd/dditems/handles/module.mk
+ dd/dditems/handles/module.mk
@@ -10,12 +10,12 @@
#######################################################################
pgadmin3_SOURCES += \
- $(srcdir)/dd/dditems/locators/ddAddColLocator.cpp \
- $(srcdir)/dd/dditems/locators/ddAddFkLocator.cpp \
- $(srcdir)/dd/dditems/locators/ddMinMaxTableLocator.cpp \
- $(srcdir)/dd/dditems/locators/ddRemoveTableLocator.cpp \
- $(srcdir)/dd/dditems/locators/ddScrollBarTableLocator.cpp \
- $(srcdir)/dd/dditems/locators/ddTableBottomLocator.cpp
+ dd/dditems/locators/ddAddColLocator.cpp \
+ dd/dditems/locators/ddAddFkLocator.cpp \
+ dd/dditems/locators/ddMinMaxTableLocator.cpp \
+ dd/dditems/locators/ddRemoveTableLocator.cpp \
+ dd/dditems/locators/ddScrollBarTableLocator.cpp \
+ dd/dditems/locators/ddTableBottomLocator.cpp
EXTRA_DIST += \
- $(srcdir)/dd/dditems/locators/module.mk
+ dd/dditems/locators/module.mk
@@ -9,11 +9,11 @@
#
#######################################################################
-include $(srcdir)/dd/dditems/figures/module.mk
-include $(srcdir)/dd/dditems/handles/module.mk
-include $(srcdir)/dd/dditems/locators/module.mk
-include $(srcdir)/dd/dditems/tools/module.mk
-include $(srcdir)/dd/dditems/utilities/module.mk
+include dd/dditems/figures/module.mk
+include dd/dditems/handles/module.mk
+include dd/dditems/locators/module.mk
+include dd/dditems/tools/module.mk
+include dd/dditems/utilities/module.mk
EXTRA_DIST += \
- $(srcdir)/dd/dditems/module.mk
+ dd/dditems/module.mk
@@ -10,8 +10,8 @@
#######################################################################
pgadmin3_SOURCES += \
- $(srcdir)/dd/dditems/tools/ddColumnFigureTool.cpp \
- $(srcdir)/dd/dditems/tools/ddColumnTextTool.cpp
+ dd/dditems/tools/ddColumnFigureTool.cpp \
+ dd/dditems/tools/ddColumnTextTool.cpp
EXTRA_DIST += \
- $(srcdir)/dd/dditems/tools/module.mk
+ dd/dditems/tools/module.mk
@@ -10,8 +10,8 @@
#######################################################################
pgadmin3_SOURCES += \
- $(srcdir)/dd/dditems/utilities/ddPrecisionScaleDialog.cpp \
- $(srcdir)/dd/dditems/utilities/ddSelectKindFksDialog.cpp \
- $(srcdir)/dd/dditems/utilities/ddTableNameDialog.cpp
+ dd/dditems/utilities/ddPrecisionScaleDialog.cpp \
+ dd/dditems/utilities/ddSelectKindFksDialog.cpp \
+ dd/dditems/utilities/ddTableNameDialog.cpp
EXTRA_DIST += \
- $(srcdir)/dd/dditems/utilities/module.mk
+ dd/dditems/utilities/module.mk
@@ -10,13 +10,13 @@
#######################################################################
pgadmin3_SOURCES += \
- $(srcdir)/dd/ddmodel/ddDatabaseDesign.cpp \
- $(srcdir)/dd/ddmodel/ddDrawingEditor.cpp \
- $(srcdir)/dd/ddmodel/ddDBReverseEnginering.cpp \
- $(srcdir)/dd/ddmodel/ddModelBrowser.cpp \
- $(srcdir)/dd/ddmodel/ddGenerationWizard.cpp \
- $(srcdir)/dd/ddmodel/ddDrawingView.cpp \
- $(srcdir)/dd/ddmodel/ddBrowserDataContainer.cpp
+ dd/ddmodel/ddDatabaseDesign.cpp \
+ dd/ddmodel/ddDrawingEditor.cpp \
+ dd/ddmodel/ddDBReverseEnginering.cpp \
+ dd/ddmodel/ddModelBrowser.cpp \
+ dd/ddmodel/ddGenerationWizard.cpp \
+ dd/ddmodel/ddDrawingView.cpp \
+ dd/ddmodel/ddBrowserDataContainer.cpp
EXTRA_DIST += \
- $(srcdir)/dd/ddmodel/module.mk
+ dd/ddmodel/module.mk
View
@@ -9,9 +9,9 @@
#
#######################################################################
-include $(srcdir)/dd/dditems/module.mk
-include $(srcdir)/dd/ddmodel/module.mk
+include dd/dditems/module.mk
+include dd/ddmodel/module.mk
EXTRA_DIST += \
- $(srcdir)/dd/module.mk
+ dd/module.mk
Oops, something went wrong.

0 comments on commit e7e2ea2

Please sign in to comment.