From 5480b9a4e9ede16208f15e6bc166b5df63e72fe8 Mon Sep 17 00:00:00 2001
From: Jan Willamowius <jan@willamowius.de>
Date: Sat, 2 Oct 2010 21:29:30 +0000
Subject: [PATCH] move addpasswd to subdir

---
 Makefile.in                              | 15 +++------------
 addpasswd/Makefile                       | 24 ++++++++++++++++++++++++
 addpasswd.cxx => addpasswd/addpasswd.cxx |  2 +-
 addpasswd_2008.vcproj                    |  2 +-
 addpasswd_2010.vcxproj                   |  4 ++--
 changes.txt                              |  1 +
 docs/manual/installation.sgml            |  3 ++-
 7 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 addpasswd/Makefile
 rename addpasswd.cxx => addpasswd/addpasswd.cxx (98%)

diff --git a/Makefile.in b/Makefile.in
index f2a64e40..806d32fa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 # -*- mode: Makefile -*-
 # Copyright (C) 2002 by its various Authors, see CVS-log
 #
-# PURPOSE OF THIS FILE: Make file for OpenH323 Gatekeeper
+# PURPOSE OF THIS FILE: Make file for GNU Gatekeeper
 #
 # - Automatic Version Information via RCS:
 #   $Id$
@@ -38,7 +38,7 @@ HEADERS  = GkClient.h GkStatus.h Neighbor.h ProxyChannel.h RasPDU.h \
            statusacct.h syslogacct.h capctrl.h MakeCall.h h460presence.h @HEADERS@
 
 # add cleanup files for non-default targets
-CLEAN_FILES += $(OBJDIR)/addpasswd $(OBJDIR)/addpasswd.o docs/manual/*.html
+CLEAN_FILES += docs/manual/*.html
 # add cleanup files for autoconf
 #CLEAN_FILES += Makefile config.*
 
@@ -123,20 +123,11 @@ STDCCFLAGS += -fno-strict-aliasing
 versionts.h: $(subst version.cxx,,$(SOURCES)) $(HEADERS) $(OH323_LIBDIR)/$(OH323_FILE) $(PW_LIBDIR)/$(PTLIB_FILE)
 	@touch $@
 
-# extra targets
-addpasswd: $(OBJDIR)/addpasswd.o
-	$(CXX) -o $(OBJDIR)/addpasswd $(CFLAGS) $(OBJDIR)/addpasswd.o $(LDFLAGS) -l$(PTLIB_BASE)$(LIB_TYPE) $(ENDLDLIBS) $(ENDLDFLAGS)
-
 doc:
 	$(MAKE) -C docs/manual html
 
-install: install-addpasswd
-
-install-addpasswd: addpasswd
-	$(INSTALL) $(OBJDIR)/addpasswd $(INSTALLBIN_DIR)
-
 static:
-	P_SHAREDLIB=0 LDFLAGS=-static $(MAKE) optnoshared addpasswd
+	P_SHAREDLIB=0 LDFLAGS=-static $(MAKE) optnoshared
 
 #
 # By this command the build number may be incremented
diff --git a/addpasswd/Makefile b/addpasswd/Makefile
new file mode 100644
index 00000000..4b0b8e1a
--- /dev/null
+++ b/addpasswd/Makefile
@@ -0,0 +1,24 @@
+#
+# Makefile
+#
+# Makefile for addpasswd
+#
+# Copyright (C) 2010 Jan Willamowius, jan@willamowius.de
+#
+# $Log$
+# Revision 1.1  2004/12/14 07:04:05  csoutheren
+# Initial version
+#
+
+
+PROG = addpasswd
+SOURCES := addpasswd.cxx
+
+ifndef PTLIBDIR
+PTLIBDIR=${HOME}/ptlib
+endif
+include $(PTLIBDIR)/make/ptlib.mak
+
+static:
+	P_SHAREDLIB=0 LDFLAGS=-static $(MAKE) optnoshared
+
diff --git a/addpasswd.cxx b/addpasswd/addpasswd.cxx
similarity index 98%
rename from addpasswd.cxx
rename to addpasswd/addpasswd.cxx
index 4ff58fd1..6c29d2e8 100644
--- a/addpasswd.cxx
+++ b/addpasswd/addpasswd.cxx
@@ -7,7 +7,7 @@
 // This work is published under the GNU Public License (GPL)
 // see file COPYING for details.
 // We also explicitly grant the right to link this code
-// with the OpenH323 library.
+// with the PTLib library.
 //
 //////////////////////////////////////////////////////////////////
 
diff --git a/addpasswd_2008.vcproj b/addpasswd_2008.vcproj
index 72a8efee..31a4a086 100644
--- a/addpasswd_2008.vcproj
+++ b/addpasswd_2008.vcproj
@@ -209,7 +209,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="addpasswd.cxx"
+			RelativePath="addpasswd\addpasswd.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/addpasswd_2010.vcxproj b/addpasswd_2010.vcxproj
index c903c3bf..d9c28571 100644
--- a/addpasswd_2010.vcxproj
+++ b/addpasswd_2010.vcxproj
@@ -151,7 +151,7 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="addpasswd.cxx">
+    <ClCompile Include="addpasswd\addpasswd.cxx">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -159,4 +159,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/changes.txt b/changes.txt
index bb751f39..3c5077f5 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,6 @@
 Changes from 2.3.2 to 2.3.3
 ===========================
+- addpasswd moved to subdir
 - BUGFIX(routedmode.sgml): TcpKeepAlive= has always defaulted to 0
 - BUGFIX(Toolkit.cxx): disregard IPv6 addresses if the machine has any
 - BUGFIX(SoftPBX.cxx): DisconnectIP now disconnects all calls on the IP as specified
diff --git a/docs/manual/installation.sgml b/docs/manual/installation.sgml
index fae3de8c..765cc6cb 100644
--- a/docs/manual/installation.sgml
+++ b/docs/manual/installation.sgml
@@ -150,7 +150,8 @@ in the config. The <tt/addpasswd/ utility is required to generate and store
 these encrypted passwords. This utility is included with the gatekeeper 
 and can be compiled using:
 <tscreen><verb>
-$ make addpasswd
+$ cd addpasswd
+$ make optnoshared
 </verb></tscreen>
 
 The usage is as follows: