From 5c75241b4b2297e6fd21d193bb1abfa7f17232b3 Mon Sep 17 00:00:00 2001 From: soochoi Date: Wed, 7 Jun 2006 16:25:16 +0000 Subject: [PATCH] merge login_capture and LoginCapture -continue --- LoginCapture/Makefile.am | 32 +++++++++++++++++++ .../linux/Makefile.am | 0 .../linux/PAM/Makefile.am | 0 .../linux/PAM/linux/Makefile.am | 0 .../linux/PAM/linux/link.lux | 0 .../linux/PAM/linux/objs.lux | 0 .../linux/PAM/linux/pam_csss_lux.exp | 0 .../linux/PAM/linux/pam_micasa_lux.exp | 0 .../linux/PAM/pam_sscs.c | 0 .../linux/PAM/pam_sscs.h | 0 .../linux/PAM/pam_sscs_utils.c | 0 LoginCapture/windows/Makefile.am | 1 - configure.in | 6 ++-- 13 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 LoginCapture/Makefile.am rename {login_capture => LoginCapture}/linux/Makefile.am (100%) rename {login_capture => LoginCapture}/linux/PAM/Makefile.am (100%) rename {login_capture => LoginCapture}/linux/PAM/linux/Makefile.am (100%) rename {login_capture => LoginCapture}/linux/PAM/linux/link.lux (100%) rename {login_capture => LoginCapture}/linux/PAM/linux/objs.lux (100%) rename {login_capture => LoginCapture}/linux/PAM/linux/pam_csss_lux.exp (100%) rename {login_capture => LoginCapture}/linux/PAM/linux/pam_micasa_lux.exp (100%) rename {login_capture => LoginCapture}/linux/PAM/pam_sscs.c (100%) rename {login_capture => LoginCapture}/linux/PAM/pam_sscs.h (100%) rename {login_capture => LoginCapture}/linux/PAM/pam_sscs_utils.c (100%) diff --git a/LoginCapture/Makefile.am b/LoginCapture/Makefile.am new file mode 100644 index 00000000..e5ec8005 --- /dev/null +++ b/LoginCapture/Makefile.am @@ -0,0 +1,32 @@ +####################################################################### +# +# Copyright (C) 2006 Novell, Inc. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# +# +####################################################################### + +SUBDIRS = $(TARGET_OS) + +DIST_SUBDIRS = linux + +.PHONY: package package-clean package-install package-uninstall +package package-clean package-install package-uninstall: + $(MAKE) -C $(TARGET_OS) $@ + +maintainer-clean-local: + rm -f Makefile.in + diff --git a/login_capture/linux/Makefile.am b/LoginCapture/linux/Makefile.am similarity index 100% rename from login_capture/linux/Makefile.am rename to LoginCapture/linux/Makefile.am diff --git a/login_capture/linux/PAM/Makefile.am b/LoginCapture/linux/PAM/Makefile.am similarity index 100% rename from login_capture/linux/PAM/Makefile.am rename to LoginCapture/linux/PAM/Makefile.am diff --git a/login_capture/linux/PAM/linux/Makefile.am b/LoginCapture/linux/PAM/linux/Makefile.am similarity index 100% rename from login_capture/linux/PAM/linux/Makefile.am rename to LoginCapture/linux/PAM/linux/Makefile.am diff --git a/login_capture/linux/PAM/linux/link.lux b/LoginCapture/linux/PAM/linux/link.lux similarity index 100% rename from login_capture/linux/PAM/linux/link.lux rename to LoginCapture/linux/PAM/linux/link.lux diff --git a/login_capture/linux/PAM/linux/objs.lux b/LoginCapture/linux/PAM/linux/objs.lux similarity index 100% rename from login_capture/linux/PAM/linux/objs.lux rename to LoginCapture/linux/PAM/linux/objs.lux diff --git a/login_capture/linux/PAM/linux/pam_csss_lux.exp b/LoginCapture/linux/PAM/linux/pam_csss_lux.exp similarity index 100% rename from login_capture/linux/PAM/linux/pam_csss_lux.exp rename to LoginCapture/linux/PAM/linux/pam_csss_lux.exp diff --git a/login_capture/linux/PAM/linux/pam_micasa_lux.exp b/LoginCapture/linux/PAM/linux/pam_micasa_lux.exp similarity index 100% rename from login_capture/linux/PAM/linux/pam_micasa_lux.exp rename to LoginCapture/linux/PAM/linux/pam_micasa_lux.exp diff --git a/login_capture/linux/PAM/pam_sscs.c b/LoginCapture/linux/PAM/pam_sscs.c similarity index 100% rename from login_capture/linux/PAM/pam_sscs.c rename to LoginCapture/linux/PAM/pam_sscs.c diff --git a/login_capture/linux/PAM/pam_sscs.h b/LoginCapture/linux/PAM/pam_sscs.h similarity index 100% rename from login_capture/linux/PAM/pam_sscs.h rename to LoginCapture/linux/PAM/pam_sscs.h diff --git a/login_capture/linux/PAM/pam_sscs_utils.c b/LoginCapture/linux/PAM/pam_sscs_utils.c similarity index 100% rename from login_capture/linux/PAM/pam_sscs_utils.c rename to LoginCapture/linux/PAM/pam_sscs_utils.c diff --git a/LoginCapture/windows/Makefile.am b/LoginCapture/windows/Makefile.am index 34eabbbd..e9f0d6e2 100644 --- a/LoginCapture/windows/Makefile.am +++ b/LoginCapture/windows/Makefile.am @@ -16,7 +16,6 @@ # License along with this program; if not, write to the Free # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -# Author: Juan Carlos Luciani # ####################################################################### diff --git a/configure.in b/configure.in index 5154541c..e4105507 100644 --- a/configure.in +++ b/configure.in @@ -299,8 +299,10 @@ c_adlib/ad_ff/Makefile c_adlib/Makefile c_gui/Makefile login_capture/Makefile -login_capture/PAM/Makefile -login_capture/PAM/linux/Makefile +login_capture/linux/Makefile +login_capture/windows/Makefile +login_capture/linux/PAM/Makefile +login_capture/linux/PAM/linux/Makefile c_jwrapper/Makefile c_jwrapper/src/Makefile c_jwrapper/jnsscs/Makefile