Makefiles: SUBDIR support in defs.in

This reduces the ammount of duplication in the makefiles.  Currently every
(excpt for pkg) subdir makefile does:

        DEPTH=..
        SRCDIR=${DEPTH}/${TOPSRCDIR}/<name>
        VPATH=@DEPTH@/@SRCDIR@/<name>

This makes it just:
        DEPTH=..
        SUBDIR=<name>

SRCDIR and VPATH are handled by the included defs

diff --git a/config/Makefile.in b/config/Makefile.in
index 451568a47610bd89a5c34d4adf466b30d27ee73c..c89394a6668e57eb1e88c657339a6d0db3ef8e7a 100644 (file)
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -37,11 +37,9 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=config
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/config
-VPATH  = ../@SRCDIR@/config
-
 CONFIGFILES=class1 \
        class1.0 \
        class2 \

diff --git a/defs.in b/defs.in
index d21438e552dbbc20aed1e3f39f1febed70e07f9e..07a854fe25050250a6ee3c7a8d9bd6391c2b8084 100644 (file)
--- a/defs.in
+++ b/defs.in
@@ -60,6 +60,8 @@ SENDMAIL      = @SENDMAIL@
 #
 TOPSRCDIR      = @SRCDIR@
 PORT           = ${DEPTH}/port
+SRCDIR          = ${DEPTH}/${TOPSRCDIR}/${SUBDIR}
+VPATH           = ${DEPTH}/${TOPSRCDIR}/${SUBDIR}
 #
 # PostScript imaging support to setup for the default
 # installation.  This should be one of "gs" or "dps"

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 2a69acc4ea2909b19bc56d1a666af87d2324e699..5a905c3f6b21c4a9db741ce9d2d962b4ec7114d6 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -37,10 +37,9 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=etc
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/etc
-VPATH  = ../@SRCDIR@/etc
 DIR_SYSVINIT   = @SYSVINITDIR@
 DIR_SYSVINITSTART      = @SYSVINITSTARTDIR@
 DIR_SYSVINITSTOP       = @SYSVINITSTOPDIR@

diff --git a/faxalter/Makefile.in b/faxalter/Makefile.in
index 98a019e619cf531bd0cffb30c736b0762bcb599e..a1185c36451830956931d610f0b3323e0a3f8b96 100644 (file)
--- a/faxalter/Makefile.in
+++ b/faxalter/Makefile.in
@@ -37,11 +37,9 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=faxalter
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/faxalter
-VPATH  = ../@SRCDIR@/faxalter
-
 C++FILES= faxalter.c++
 TARGETS        = faxalter
 

diff --git a/faxcover/Makefile.in b/faxcover/Makefile.in
index 03db7c7e261b1b95c3a83c23974edbb5ac80343c..a6a3b2f4b6b0011e754b419ca836f4418536c43a 100644 (file)
--- a/faxcover/Makefile.in
+++ b/faxcover/Makefile.in
@@ -37,11 +37,9 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=faxcover
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/faxcover
-VPATH  = ../@SRCDIR@/faxcover
-
 C++FILES= faxcover.c++
 TARGETS        = faxcover
 

diff --git a/faxd/Makefile.in b/faxd/Makefile.in
index 4e34a6d906b837dd6b3ce8a342e20ee427ce4e35..bdc58e6a377a7badc4ed797f8b851f88166fdcbd 100644 (file)
--- a/faxd/Makefile.in
+++ b/faxd/Makefile.in
@@ -37,11 +37,10 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=faxd
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
 LIBVERSION     = @VERSION@
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/faxd
-VPATH  = ../@SRCDIR@/faxd
 
 C++FILES=ClassModem.c++ \
        FaxModem.c++ \

diff --git a/faxmail/Makefile.in b/faxmail/Makefile.in
index 36ca14c7cf4014f693c808a195c9caa7a8e7e2d1..f525ef3fdc8dd49c8cfc6ef5fcba5624fa889d96 100644 (file)
--- a/faxmail/Makefile.in
+++ b/faxmail/Makefile.in
@@ -37,11 +37,9 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=faxmail
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/faxmail
-VPATH  = ../@SRCDIR@/faxmail
-
 C++FILES= faxmail.c++ MIMEState.c++ MsgFmt.c++
 TARGETS        = faxmail
 

diff --git a/faxrm/Makefile.in b/faxrm/Makefile.in
index 7ae27b1691b9c1bbfd77cd9e17ae98b88438fa82..5ad3a4e15a13d04643c5e84ef13e4cae886f18f3 100644 (file)
--- a/faxrm/Makefile.in
+++ b/faxrm/Makefile.in
@@ -37,11 +37,9 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=faxrm
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/faxrm
-VPATH  = ../@SRCDIR@/faxrm
-
 C++FILES= faxrm.c++
 TARGETS        = faxrm
 

diff --git a/faxstat/Makefile.in b/faxstat/Makefile.in
index 96477a3ca6bc44c29f8601444bfc1cacbdfdf711..151b28ea45258685c9b45fb60cd61617cdf0ede4 100644 (file)
--- a/faxstat/Makefile.in
+++ b/faxstat/Makefile.in
@@ -37,11 +37,9 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=faxstat
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/faxstat
-VPATH  = ../@SRCDIR@/faxstat
-
 C++FILES= faxstat.c++
 TARGETS        = faxstat
 

diff --git a/hfaxd/Makefile.in b/hfaxd/Makefile.in
index 88e6ee822c1cfdb1487eb81df3d257bfbf92af4c..bdb50cfe4d6087299a6f31d4e224feacec4da740 100644 (file)
--- a/hfaxd/Makefile.in
+++ b/hfaxd/Makefile.in
@@ -37,10 +37,8 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=hfaxd
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
-
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/hfaxd
-VPATH  = ../@SRCDIR@/hfaxd
 FAXDSRCDIR= ${DEPTH}/${TOPSRCDIR}/faxd
 
 C++FILES=Admin.c++ \

diff --git a/libhylafax/Makefile.in b/libhylafax/Makefile.in
index 82191c1e3ab87a65eba197125410a62887d6563e..ebab0eb022b2bf046449833b5c12801bd964205e 100644 (file)
--- a/libhylafax/Makefile.in
+++ b/libhylafax/Makefile.in
@@ -1,9 +1,8 @@
 DEPTH=..
+SUBDIR=libhylafax
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
 LIBVERSION     = @VERSION@
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/libhylafax
-VPATH  = ../@SRCDIR@/libhylafax
 
 LDIRT = libhylafax*
 

diff --git a/man/Makefile.in b/man/Makefile.in
index 41734851e8a1493255bf319f220f3ed4ac8fe8d6..da393a25fae9e5bd14a0ca51ef0ca68c635228e9 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -37,10 +37,9 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=man
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/man
-
 #
 # Manual page targets that are installed.
 #

diff --git a/nls-rules.mk b/nls-rules.mk
index 1936d9ee88ca0335782169f480246041ab6d02d5..9f4acb33b7aaa171cc90a18f15a9b24285e9b570 100644 (file)
--- a/nls-rules.mk
+++ b/nls-rules.mk
@@ -16,5 +16,8 @@ nls-SHOUT:
        @echo "MO: '${MO_FILES}'"
        @echo "FILES: ${SOURCES}"
 
+OLDmessages.po: ${SOURCES}
+       ${XGETTEXT} -D ${DEPTH}/${SUBDIR} -D ${SRCDIR} -n ${addprefix -k, _ N_ ${GETTEXT_TRIGGERS}} ${SOURCES}
+
 messages.po: ${SOURCES}
-       ${XGETTEXT} -D ${SRCDIR} -n ${addprefix -k, _ N_ ${GETTEXT_TRIGGERS}} ${SOURCES}
+       ${XGETTEXT} -D ${DEPTH} -D ${DEPTH}/${TOPSRCDIR} -n ${addprefix -k, _ N_ ${GETTEXT_TRIGGERS}} ${patsubst %, ${SUBDIR}/%, ${SOURCES}}

diff --git a/po/Makefile.in b/po/Makefile.in
index d064781eee43dae8f1a8f1b19181cede6d816c2b..d4af4027829b7d283247df1c6a7084ce4ef70989 100644 (file)
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -7,11 +7,10 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=po
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
 LIBVERSION     = @VERSION@
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/po
-VPATH  = ../@SRCDIR@/po
 
 TARGETS=all-mo
 

diff --git a/port/Makefile.in b/port/Makefile.in
index 9608590463769a3ca86ef1ad2c146762de074161..e1bc961cab52362184d85e92fd4b9baf1d4f594f 100644 (file)
--- a/port/Makefile.in
+++ b/port/Makefile.in
@@ -37,11 +37,9 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=port
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/port
-VPATH  = ../@SRCDIR@/port
-
 CFILES = @PORTFUNCS@
 TARGETS        = libport.a
 

diff --git a/regex/Makefile.in b/regex/Makefile.in
index 2334a97ef325846fda4f84e2c68df3f538e54acc..7f99bdec38e8d42a89ee9dc5c38fdb4eaef02490 100644 (file)
--- a/regex/Makefile.in
+++ b/regex/Makefile.in
@@ -37,11 +37,9 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=regex
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/regex
-VPATH  = ../@SRCDIR@/regex
-
 CFILES= regexec.c regcomp.c regfree.c regerror.c
 TARGETS=libregex.a
 

diff --git a/sendfax/Makefile.in b/sendfax/Makefile.in
index 09142a3aa51e730b198308f0ce246e25e90ad385..90186ad70b5f4ad86c093eae7c0db14dc401c765 100644 (file)
--- a/sendfax/Makefile.in
+++ b/sendfax/Makefile.in
@@ -37,11 +37,9 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=sendfax
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/sendfax
-VPATH  = ../@SRCDIR@/sendfax
-
 C++FILES= sendfax.c++
 TARGETS        = sendfax
 

diff --git a/sendpage/Makefile.in b/sendpage/Makefile.in
index 1f0597c752a9a9a795e770af58b8cda880c17944..3ccba08a8b016b6d2b627db8e4ad2b9ec1eb7384 100644 (file)
--- a/sendpage/Makefile.in
+++ b/sendpage/Makefile.in
@@ -37,11 +37,9 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=sendpage
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/sendpage
-VPATH  = ../@SRCDIR@/sendpage
-
 C++FILES= sendpage.c++
 TARGETS        = sendpage
 

diff --git a/sgi2fax/Makefile.in b/sgi2fax/Makefile.in
index 2f5223fd364198a71b8e0fb707091c8f856f894b..e49d3cdc7787e1103b5738e1500a229b297284b3 100644 (file)
--- a/sgi2fax/Makefile.in
+++ b/sgi2fax/Makefile.in
@@ -37,11 +37,9 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=sgi2fax
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/sgi2fax
-VPATH  = ../@SRCDIR@/sgi2fax
-
 CFILES = imgtofax.c hipass.c izoom.c lut.c row.c rand.c
 TARGETS        = sgi2fax
 

diff --git a/util/Makefile.in b/util/Makefile.in
index c13e338e0f48cbbf2edf6429dce71be794a899e8..f106416b4ea7f4bbb2314f6635c631dec77136f0 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -37,11 +37,9 @@
 # CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
+SUBDIR=util
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
-SRCDIR = ${DEPTH}/${TOPSRCDIR}/util
-VPATH  = ../@SRCDIR@/util
-
 TARGETS=faxmsg faxmodem faxadduser faxconfig faxdeluser \
     faxstate faxinfo faxwatch textfmt dialtest typetest tiffcheck