reworked hierarchy

diff --git a/deptrack/.cvsignore b/deptrack/.cvsignore
index 867b4e5..a0b340e 100644 (file)
--- a/deptrack/.cvsignore
+++ b/deptrack/.cvsignore
@@ -3,8 +3,6 @@ autom4te.cache
 configure
 config.log
 config.status
-deptrack
-deptrack.1
 install-sh
 Makefile
 Makefile.in

diff --git a/deptrack/Makefile.am b/deptrack/Makefile.am
index 196cec2..1161c31 100644 (file)
--- a/deptrack/Makefile.am
+++ b/deptrack/Makefile.am
@@ -2,8 +2,3 @@
 
 SUBDIRS = @SUBDIRS@
 
-bin_SCRIPTS = deptrack
-
-man_MANS = deptrack.1
-
-EXTRA_DIST = deptrackrc deptrack.sql

diff --git a/deptrack/configure.ac b/deptrack/configure.ac
index 8fde110..316c80a 100644 (file)
--- a/deptrack/configure.ac
+++ b/deptrack/configure.ac
@@ -3,7 +3,7 @@ dnl $Id$
 
 AC_INIT(Makefile.am)
 PACKAGE=deptrack
-VERSION=0.3
+VERSION=0.3.0
 
 dnl
 AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
@@ -11,11 +11,12 @@ AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 
 dnl subdirectories
-SUBDIRS=
+SUBDIRS="doc src"
 AC_SUBST(SUBDIRS)
 AC_CONFIG_SUBDIRS(SUBDIRS)
 
 dnl output
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([deptrack deptrack.1])
+AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile])
+AC_CONFIG_FILES([doc/deptrack.1])
+AC_CONFIG_FILES([src/deptrack])
 AC_OUTPUT

diff --git a/deptrack/debian/changelog b/deptrack/debian/changelog
index d117f2c..4eb0a88 100644 (file)
--- a/deptrack/debian/changelog
+++ b/deptrack/debian/changelog
@@ -1,4 +1,4 @@
-deptrack (0.3-1) unstable; urgency=low
+deptrack (0.3.0-1) unstable; urgency=low
 
   * Initial Release.
 

diff --git a/deptrack/debian/docs b/deptrack/debian/docs
index d6db2ea..14c4837 100644 (file)
--- a/deptrack/debian/docs
+++ b/deptrack/debian/docs
@@ -1,2 +1,2 @@
 README
-deptrack.sql
+doc/deptrack.sql

diff --git a/deptrack/debian/examples b/deptrack/debian/examples
index 34e3e70..c08b5a3 100644 (file)
--- a/deptrack/debian/examples
+++ b/deptrack/debian/examples
@@ -1 +1 @@
-deptrackrc
+doc/deptrackrc

diff --git a/deptrack/deptrack.1.in b/deptrack/deptrack.1.in
deleted file mode 100644 (file)
index 09f9ab4..0000000
--- a/deptrack/deptrack.1.in
+++ /dev/null
@@ -1,8 +0,0 @@
-.TH DEPTRACK 1 "1 February 2003"  "Version @VERSION@" "PHP dependency tracker"
-.SH NAME
-deptrack \- a PHP dependency tracker
-.SH SYNOPSIS
-.B deptrack
-.SH DESCRIPTION
-\fBdeptrack\fR is a script that allows you to analyse the dependencies of a set
-of PHP files and store the result in a MySQL database.

diff --git a/deptrack/deptrack.sql b/deptrack/deptrack.sql
deleted file mode 100644 (file)
index 4da6f22..0000000
--- a/deptrack/deptrack.sql
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Table structure for table `dep`
-#
-
-CREATE TABLE dep (
-  id int(8) NOT NULL auto_increment,
-  dir int(6) NOT NULL default '0',
-  page int(6) NOT NULL default '0',
-  dep int(6) NOT NULL default '0',
-  type enum('include','image','link') NOT NULL default 'include',
-  PRIMARY KEY  (id)
-) TYPE=MyISAM;
-# --------------------------------------------------------
-
-#
-# Table structure for table `dir`
-#
-
-CREATE TABLE dir (
-  id int(6) NOT NULL auto_increment,
-  path varchar(255) NOT NULL default '',
-  PRIMARY KEY  (id),
-  UNIQUE KEY path (path)
-) TYPE=MyISAM;
-# --------------------------------------------------------
-
-#
-# Table structure for table `file`
-#
-
-CREATE TABLE file (
-  id int(6) NOT NULL auto_increment,
-  path varchar(255) NOT NULL default '',
-  type enum('dead','page','include','image') NOT NULL default 'dead',
-  dir int(6) NOT NULL default '0',
-  PRIMARY KEY  (id),
-  UNIQUE KEY path (path)
-) TYPE=MyISAM;
-

diff --git a/deptrack/deptrackrc b/deptrack/deptrackrc
deleted file mode 100644 (file)
index 6aae378..0000000
--- a/deptrack/deptrackrc
+++ /dev/null
@@ -1,15 +0,0 @@
-# default values for ~/.deptrackrc
-# $Id$
-
-# database
-db_db          =       "deptrack"
-db_host                =       "localhost"
-db_pwd         =       ""
-db_user                =       "deptrack"
-
-# files and masks
-include_path   =       "."
-mask_img       =       "\.(png|gif|jpg)$"
-mask_inc       =       "\.inc(\.php)?$"
-mask_php       =       "(?<!\.inc)\.php$"
-

diff --git a/deptrack/src/.cvsignore b/deptrack/src/.cvsignore
new file mode 100644 (file)
index 0000000..edcd086
--- /dev/null
+++ b/deptrack/src/.cvsignore
@@ -0,0 +1,3 @@
+deptrack
+Makefile
+Makefile.in

diff --git a/deptrack/src/Makefile.am b/deptrack/src/Makefile.am
new file mode 100644 (file)
index 0000000..9400041
--- /dev/null
+++ b/deptrack/src/Makefile.am
@@ -0,0 +1,5 @@
+# $Id$
+
+SUBDIRS =
+
+bin_SCRIPTS = deptrack

diff --git a/deptrack/deptrack.in b/deptrack/src/deptrack.in
similarity index 99%
rename from deptrack/deptrack.in
rename to deptrack/src/deptrack.in
index af73e41..efe9f81 100644 (file)
--- a/deptrack/deptrack.in
+++ b/deptrack/src/deptrack.in
@@ -436,7 +436,7 @@ sub about {
 # return program syntax 
 sub syntax {
   print "Syntax:\n",
-        "  deptrack.pl [options] root_directory\n\n",
+        "  deptrack [options] root_directory\n\n",
        " Options:\n",
         "  -h          - this help message\n",
         "  -f <file>   - use <file> as config file\n",