From 74a6359218cdd8a48ce92c3ed27fa2095c673ab1 Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Tue, 20 Jun 2006 23:30:50 +0000 Subject: [PATCH] Changes to allow the "make dist" command to work. --- .../server/ApacheSupport/2.2/Makefile.am | 2 +- .../server/ApacheSupport/2.2/linux/Makefile.am | 2 +- .../idenTokenProviders/Makefile.am | 2 +- .../idenTokenProviders/casa/linux/Makefile.am | 8 ++++---- .../server/AuthTokenValidate/linux/Makefile.am | 16 ++++++++-------- CASA-auth-token/server/Makefile.am | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CASA-auth-token/server/ApacheSupport/2.2/Makefile.am b/CASA-auth-token/server/ApacheSupport/2.2/Makefile.am index 331523b2..6184e626 100644 --- a/CASA-auth-token/server/ApacheSupport/2.2/Makefile.am +++ b/CASA-auth-token/server/ApacheSupport/2.2/Makefile.am @@ -26,7 +26,7 @@ DIST_SUBDIRS = linux CFILES = -EXTRA_DIST = $(CFILES) *.h +EXTRA_DIST = $(CFILES) .PHONY: package package-clean package-install package-uninstall package package-clean package-install package-uninstall: diff --git a/CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am b/CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am index 270c6def..88f50f93 100644 --- a/CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am +++ b/CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am @@ -36,7 +36,7 @@ ROOT = ../../../.. CASAINCLUDE = ../../../../../CASA/include LIBDIR = $(ROOT)/$(LIB) -APACHEROOT = ../../../../../../httpd-2.2.2/instance +APACHEROOT = ../../../../../../apache2.2 # handle Mono secondary dependencies export MONO_PATH := $(MONO_PATH) diff --git a/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/Makefile.am b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/Makefile.am index 792f6835..2fb64053 100644 --- a/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/Makefile.am +++ b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/Makefile.am @@ -26,7 +26,7 @@ DIST_SUBDIRS = casa CFILES = -EXTRA_DIST = $(CFILES) *.h +EXTRA_DIST = $(CFILES) .PHONY: package package-clean package-install package-uninstall package package-clean package-install package-uninstall: diff --git a/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am index 963c68a1..e62f0457 100644 --- a/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am +++ b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am @@ -46,10 +46,10 @@ PLATFORMDEPENDENTSOURCEDIR = . MODULE_NAME = casa_iden_token MODULE_EXT = so -CFILES = $(srcdir)/identokenprovider.c \ - $(srcdir)/identoken.c \ - $(srcdir)/util.c \ - $(srcdir)/platform.c +CFILES = ../identokenprovider.c \ + ../identoken.c \ + ../util.c \ + platform.c CSFILES_CSC := INCLUDES = -I. -I.. -I../../.. -I$(CASAINCLUDE) -I../../../../../include diff --git a/CASA-auth-token/server/AuthTokenValidate/linux/Makefile.am b/CASA-auth-token/server/AuthTokenValidate/linux/Makefile.am index 11aad514..6811ab26 100644 --- a/CASA-auth-token/server/AuthTokenValidate/linux/Makefile.am +++ b/CASA-auth-token/server/AuthTokenValidate/linux/Makefile.am @@ -31,7 +31,7 @@ SUBDIRS = DIST_SUBDIRS = -ROOT = ../../../ +ROOT = ../../.. CASAINCLUDE = ../../../../CASA/include LIBDIR = $(ROOT)/$(LIB) @@ -45,13 +45,13 @@ PLATFORMDEPENDENTSOURCEDIR = . MODULE_NAME = libcasa_s_authtoken MODULE_EXT = so -CFILES = $(srcdir)/config.c \ - $(srcdir)/authtoken.c \ - $(srcdir)/principal.c \ - $(srcdir)/util.c \ - $(srcdir)/validate.c \ - $(srcdir)/identoken.c \ - $(srcdir)/platform.c +CFILES = ../config.c \ + ../authtoken.c \ + ../principal.c \ + ../util.c \ + ../validate.c \ + ../identoken.c \ + platform.c CSFILES_CSC := INCLUDES = -I. -I.. -I$(CASAINCLUDE) -I../../../include diff --git a/CASA-auth-token/server/Makefile.am b/CASA-auth-token/server/Makefile.am index 7c9018be..58613019 100644 --- a/CASA-auth-token/server/Makefile.am +++ b/CASA-auth-token/server/Makefile.am @@ -20,8 +20,8 @@ # ####################################################################### -SUBDIRS = AuthTokenValidate ApacheSupport PamSupport -#SUBDIRS = AuthTokenValidate ApacheSupport PamSupport AuthTokenSvc JaasSupport +#SUBDIRS = AuthTokenValidate ApacheSupport PamSupport +SUBDIRS = AuthTokenValidate ApacheSupport PamSupport AuthTokenSvc JaasSupport DIST_SUBDIRS = AuthTokenValidate ApacheSupport PamSupport AuthTokenSvc JaasSupport