* restructuring

--HG--
extra : convert_revision : svn%3Aeebe1cee-a9af-4fe4-bd26-ad572b19c5ab/trunk%404

CHANGELOG

@@ -1,4 +1,7 @@
 Version 0.2
+2005-05-02:
+
+	* restructuring
 
 2005-04-30:
 

README

@@ -54,6 +54,7 @@
 
         gentoo-linux (pc and ppc with gcc3.4.3) 
         freebsd5.3 (pc gcc3.4.2)
+        slackware (pc, gcc3.3.5, shadow)
 
 3. usage
 --------

SConstruct

@@ -10,11 +10,8 @@ import sys
 aklock_version = '0.2'
 aklock_optfile = 'scons.opts'
 
-aklock_distfiles = ['aklock.c', 'akcursors.c', 'aklock.h',
-                    'lock.bitmap', 'mask.bitmap',
-                    'SConstruct', 'README', 'CHANGELOG' ]
-aklock_sources = [ 'aklock.c', 'akcursors.c' ]
-aklock_target = 'aklock'
+aklock_target = 'src/aklock'
+
 Default(aklock_target)
 
 
@@ -34,43 +31,51 @@ Help(aklock_options.GenerateHelpText(aklock_env))
 ###########################################################
 #
 #
-build = aklock_env.Copy()
 
 if sys.platform == "linux2" or sys.platform == "linux-i386":
-    build.AppendUnique(
+    aklock_env.AppendUnique(
         CPPDEFINES = [ 'LINUX' ])
 
-build.AppendUnique(
+aklock_env.AppendUnique(
         CPPDEFINES = [ 'VERSION=\\"'+aklock_version+'\\"' ],
         CPPFLAGS = [ '-Wall' ],
         CPPPATH = [ '/usr/X11R6/include' ],
         LIBPATH = ['/usr/X11R6/lib'],
         LIBS = [ 'X11', 'crypt' ])
 
-if build['debug']:
-    build.AppendUnique(
+if aklock_env['debug']:
+    aklock_env.AppendUnique(
             CPPDEFINES = [ 'DEBUG' ],
             LINKFLAGS = [ '-g' ],
             CPPFLAGS = [ '-g' ])
 
-if build['pam']:
-    build.AppendUnique(
+if aklock_env['pam']:
+    aklock_env.AppendUnique(
             CPPDEFINES = [ 'PAM_PWD' ],
             LIBS = [ 'pam' ])
 
     if sys.platform == 'linux2' or sys.platform == 'linux-i386':
-        build.AppendUnique(LIBS = ['pam_misc'])
+        aklock_env.AppendUnique(LIBS = ['pam_misc'])
     
 
-if build['shadow']:
-    build.AppendUnique(
+if aklock_env['shadow']:
+    aklock_env.AppendUnique(
             CPPDEFINES = [ 'SHADOW_PWD' ])
 
-aklock_program = build.Program(aklock_target, aklock_sources)
-build.AddPostAction(aklock_program, Chmod(aklock_target, 0755))
+aklock_program = SConscript(
+            'src/SConscript', 
+            exports = ['aklock_env']
+        )
 
-aklock_env.Install(aklock_env['prefix']+'/bin', aklock_program)
-aklock_env.Alias('install', aklock_env['prefix']+'/bin')
+aklock_env.Install(
+            aklock_env['prefix']+'/bin', 
+            aklock_program
+        )
+
+aklock_env.Alias(
+            'install', 
+            aklock_env['prefix']+'/bin'
+        )
 
 # TODO: add a "scons dist" command which builds a propper tarball
 #aklock_env.Alias('dist', aklock_env.Tar(aklock_target + '-' + aklock_version,

src/SConscript

@@ -0,0 +1,19 @@
+#!/bin/env python
+##########################################################
+#
+# scons - buildsystem for aklock
+#
+##########################################################
+
+aklock_sources = [ 'aklock.c', 'akcursors.c' ]
+
+Import('aklock_env')
+
+build =  aklock_env.Copy()
+
+aklock = build.Program('aklock', aklock_sources)
+build.AddPostAction(aklock, Chmod(aklock, 0755))
+
+
+
+# vim:ft=python

src/akcursors.c

@@ -24,11 +24,11 @@
 /* ---------------------------------------------------------------- *\
 \* ---------------------------------------------------------------- */
 
-#include "bitmaps/mini.bitmap"
-#include "bitmaps/mini_mask.bitmap"
+#include "../bitmaps/mini.bitmap"
+#include "../bitmaps/mini_mask.bitmap"
 
-#include "bitmaps/xtr.bitmap"
-#include "bitmaps/xtr_mask.bitmap"
+#include "../bitmaps/xtr.bitmap"
+#include "../bitmaps/xtr_mask.bitmap"
 
 /* ---------------------------------------------------------------- *\
 \* ---------------------------------------------------------------- */