From c94d53f31f849261b0b495ea8388f4684d52dbf3 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Thu, 18 Mar 1999 10:58:49 +0000 Subject: [PATCH] include Makefile.am.common git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5586 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/test/Makefile.am | 18 ++++----- kadmin/Makefile.am | 8 ++-- kdc/Makefile.am | 36 +++++++++++++----- kpasswd/Makefile.am | 8 ++-- kuser/Makefile.am | 12 ++---- lib/45/Makefile.am | 8 ++-- lib/Makefile.am | 9 ++++- lib/asn1/Makefile.am | 37 ++----------------- lib/gssapi/Makefile.am | 74 +++++++++++++++++++------------------ lib/gssapi/krb5/Makefile.am | 74 +++++++++++++++++++------------------ lib/hdb/Makefile.am | 34 ++--------------- 11 files changed, 141 insertions(+), 177 deletions(-) diff --git a/appl/test/Makefile.am b/appl/test/Makefile.am index 3ba6e0905..12fbe52b4 100644 --- a/appl/test/Makefile.am +++ b/appl/test/Makefile.am @@ -1,23 +1,23 @@ # $Id$ -AUTOMAKE_OPTIONS = no-dependencies foreign - -INCLUDES = -I$(top_builddir)/include +include $(top_srcdir)/Makefile.am.common noinst_PROGRAMS = tcp_client tcp_server gssapi_server gssapi_client \ uu_server uu_client -tcp_client_SOURCES = tcp_client.c common.c +tcp_client_SOURCES = tcp_client.c common.c test_locl.h -tcp_server_SOURCES = tcp_server.c common.c +tcp_server_SOURCES = tcp_server.c common.c test_locl.h -gssapi_server_SOURCES = gssapi_server.c gss_common.c common.c +gssapi_server_SOURCES = gssapi_server.c gss_common.c common.c \ + gss_common.h test_locl.h -gssapi_client_SOURCES = gssapi_client.c gss_common.c common.c +gssapi_client_SOURCES = gssapi_client.c gss_common.c common.c \ + gss_common.h test_locl.h -uu_server_SOURCES = uu_server.c common.c +uu_server_SOURCES = uu_server.c common.c test_locl.h -uu_client_SOURCES = uu_client.c common.c +uu_client_SOURCES = uu_client.c common.c test_locl.h gssapi_server_LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LDADD) diff --git a/kadmin/Makefile.am b/kadmin/Makefile.am index ea5ba08cd..2cad3f1de 100644 --- a/kadmin/Makefile.am +++ b/kadmin/Makefile.am @@ -1,8 +1,8 @@ # $Id$ -AUTOMAKE_OPTIONS = no-dependencies foreign +include $(top_srcdir)/Makefile.am.common -INCLUDES = $(WFLAGS) -I$(top_builddir)/include $(INCLUDE_readline) +INCLUDES += $(INCLUDE_readline) sbin_PROGRAMS = kadmin @@ -10,9 +10,9 @@ libexec_PROGRAMS = kadmind kadmin_SOURCES = \ ank.c cpw.c del.c dump.c ext.c get.c init.c kadmin.c \ - load.c mod.c rename.c util.c + load.c mod.c rename.c util.c kadmin_locl.h -LIB_tgetent = @LIB_tgetent@ +kadmind_SOURCES = kadmind.c kadmin_locl.h COMMON_LDADD = \ $(top_builddir)/lib/hdb/libhdb.la \ diff --git a/kdc/Makefile.am b/kdc/Makefile.am index e38512479..003c4418e 100644 --- a/kdc/Makefile.am +++ b/kdc/Makefile.am @@ -1,8 +1,8 @@ # $Id$ -AUTOMAKE_OPTIONS = no-dependencies foreign +include $(top_srcdir)/Makefile.am.common -INCLUDES = $(WFLAGS) -I$(top_builddir)/include $(INCLUDE_krb4) +INCLUDES += $(INCLUDE_krb4) bin_PROGRAMS = string2key @@ -12,23 +12,39 @@ libexec_PROGRAMS = hprop hpropd kdc man_MANS = kdc.8 kstash.8 hprop.8 hpropd.8 -hprop_SOURCES = hprop.c hprop-common.c -hpropd_SOURCES = hpropd.c hprop-common.c +kerberos4.h +rx.h + +hprop_SOURCES = hprop.c hprop-common.c hprop.h kadb.h +hpropd_SOURCES = hpropd.c hprop-common.c hprop.h + +kstash_SOURCES = kstash.c headers.h + +string2key_SOURCES = string2key.c headers.h + +kdc_SOURCES = \ + 524.c \ + config.c \ + connect.c \ + kaserver.c \ + kdc_locl.h \ + kerberos4.c \ + kerberos4.h \ + kerberos5.c \ + log.c \ + main.c \ + misc.c \ + rx.h -kdc_SOURCES = 524.c connect.c config.c kerberos4.c kerberos5.c log.c main.c misc.c kaserver.c -if KRB4 hprop_LDADD = \ $(top_builddir)/lib/hdb/libhdb.la \ $(top_builddir)/lib/krb5/libkrb5.la \ - $(LIB_krb4) -lkdb $(LIB_krb4) \ + $(LIB_kdb) $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/roken/libroken.la \ $(DBLIB) -else -hprop_LDADD = $(LDADD) -endif LDADD = $(top_builddir)/lib/hdb/libhdb.la \ $(top_builddir)/lib/krb5/libkrb5.la \ diff --git a/kpasswd/Makefile.am b/kpasswd/Makefile.am index 821de0895..81ab10e00 100644 --- a/kpasswd/Makefile.am +++ b/kpasswd/Makefile.am @@ -1,15 +1,17 @@ # $Id$ -AUTOMAKE_OPTIONS = no-dependencies foreign - -INCLUDES = -I$(top_builddir)/include +include $(top_srcdir)/Makefile.am.common man_MANS = kpasswd.1 kpasswdd.8 bin_PROGRAMS = kpasswd +kpasswd_SOURCES = kpasswd.c kpasswd_locl.h + libexec_PROGRAMS = kpasswdd +kpasswdd_SOURCES = kpasswdd.c kpasswd_locl.h + kpasswdd_LDADD = \ $(top_builddir)/lib/kadm5/libkadm5srv.la \ $(top_builddir)/lib/hdb/libhdb.la \ diff --git a/kuser/Makefile.am b/kuser/Makefile.am index a0ef112bc..01a8f6f80 100644 --- a/kuser/Makefile.am +++ b/kuser/Makefile.am @@ -1,8 +1,8 @@ # $Id$ -AUTOMAKE_OPTIONS = no-dependencies foreign +include $(top_srcdir)/Makefile.am.common -INCLUDES = $(WFLAGS) -I$(top_builddir)/include $(INCLUDE_krb4) +INCLUDES += $(INCLUDE_krb4) man_MANS = kinit.1 klist.1 kdestroy.1 @@ -14,14 +14,8 @@ kauth_SOURCES = kinit.c kauth_options.c noinst_PROGRAMS = kfoo kverify -if KRB4 -AFSLIB=$(top_builddir)/lib/kafs/libkafs.a $(AIX_EXTRA_KAFS) -else -AFSLIB= -endif - kauth_LDADD = \ - $(AFSLIB) \ + $(LIB_kafs) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ diff --git a/lib/45/Makefile.am b/lib/45/Makefile.am index 999b8310f..892821287 100644 --- a/lib/45/Makefile.am +++ b/lib/45/Makefile.am @@ -1,11 +1,11 @@ # $Id$ -AUTOMAKE_OPTIONS = no-dependencies foreign +include $(top_srcdir)/Makefile.am.common + +INCLUDES += $(INCLUDE_krb4) lib_LIBRARIES = @EXTRA_LIB45@ EXTRA_LIBRARIES = lib45.a -INCLUDES = $(INCLUDE_krb4) - -lib45_a_SOURCES = get_ad_tkt.c mk_req.c +lib45_a_SOURCES = get_ad_tkt.c mk_req.c 45_locl.h diff --git a/lib/Makefile.am b/lib/Makefile.am index a0445db43..c0d68bb47 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,9 @@ # $Id$ -AUTOMAKE_OPTIONS = foreign no-dependencies -SUBDIRS = roken editline com_err sl asn1 des krb5 kafs hdb kadm5 gssapi @OTP_dir@ +include $(top_srcdir)/Makefile.am.common + +SUBDIRS = roken editline com_err sl asn1 des krb5 \ + kafs hdb kadm5 gssapi @OTP_dir@ + +DIST_SUBDIRS = roken editline com_err sl asn1 des krb5 \ + kafs hdb kadm5 gssapi otp diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am index 4f69153d2..d486f52a3 100644 --- a/lib/asn1/Makefile.am +++ b/lib/asn1/Makefile.am @@ -1,20 +1,11 @@ # $Id$ -AUTOMAKE_OPTIONS = no-dependencies foreign - -WFLAGS=@WFLAGS@ -CFLAGS=$(WFLAGS) @CFLAGS@ +include $(top_srcdir)/Makefile.am.common YFLAGS = -d -#YACCFLAGS = $(YFLAGS) -#lib_LIBRARIES = libasn1.a lib_LTLIBRARIES = libasn1.la -COMPILE_ET = ../com_err/compile_et - -SUFFIXES = .et .x .h - BUILT_SOURCES = \ asn1_APOptions.c \ asn1_AP_REP.c \ @@ -125,7 +116,7 @@ libasn1_la_SOURCES = \ timegm.c \ $(BUILT_SOURCES) -asn1_compile_LDADD = ../roken/libroken.la @LEXLIB@ +asn1_compile_LDADD = ../roken/libroken.la $(LEXLIB) check_der_LDADD = libasn1.la ../roken/libroken.la @@ -133,17 +124,7 @@ TESTS = check-der CLEANFILES = lex.c parse.c parse.h asn1.h $(BUILT_SOURCES) $(foo) asn1_files -incdir = $(includedir) -inc_DATA = asn1.h asn1_err.h -idir = $(top_builddir)/include - -all-local: $(inc_DATA) - @for i in $(inc_DATA); do \ - if cmp -s $$i $(idir)/$$i 2> /dev/null ; then :; else\ - echo " $(INSTALL_DATA) $$i $(idir)/$$i"; \ - $(INSTALL_DATA) $$i $(idir)/$$i; \ - fi ; \ - done +include__DATA = asn1.h asn1_err.h lex.lo: parse.h @@ -154,14 +135,4 @@ asn1_files: asn1_compile $(srcdir)/k5.asn1 $(libasn1_la_OBJECTS): asn1.h asn1_err.h -.x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ - -.et.h: - $(COMPILE_ET) $< -.et.c: - $(COMPILE_ET) $< - -asn1_err.h: asn1_err.et - -asn1_err.c: asn1_err.et +EXTRA_DIST = asn1_err.et \ No newline at end of file diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am index be72c6fef..d5b1efac8 100644 --- a/lib/gssapi/Makefile.am +++ b/lib/gssapi/Makefile.am @@ -1,43 +1,45 @@ # $Id$ -AUTOMAKE_OPTIONS = no-dependencies foreign +include $(top_srcdir)/Makefile.am.common -CFLAGS = @CFLAGS@ $(WFLAGS) - -INCLUDES = -I$(top_builddir)/include -I$(srcdir)/../krb5 +INCLUDES += -I$(srcdir)/../krb5 lib_LTLIBRARIES = libgssapi.la -libgssapi_la_SOURCES = \ - 8003.c \ - accept_sec_context.c \ - acquire_cred.c \ - add_oid_set_member.c \ - canonicalize_name.c \ - compare_name.c \ - context_time.c \ - create_emtpy_oid_set.c \ - decapsulate.c \ - delete_sec_context.c \ - display_name.c \ - display_status.c \ - duplicate_name.c \ - encapsulate.c \ - export_name.c \ - external.c \ - get_mic.c \ - import_name.c \ - indicate_mechs.c \ - init.c \ - init_sec_context.c \ - inquire_context.c \ - inquire_cred.c \ - release_buffer.c \ - release_cred.c \ - release_name.c \ - release_oid_set.c \ - test_oid_set_member.c \ - unwrap.c \ - v1.c \ - verify_mic.c \ +include_HEADERS = gssapi.h + +libgssapi_la_SOURCES = \ + 8003.c \ + accept_sec_context.c \ + acquire_cred.c \ + add_oid_set_member.c \ + canonicalize_name.c \ + compare_name.c \ + context_time.c \ + create_emtpy_oid_set.c \ + decapsulate.c \ + delete_sec_context.c \ + display_name.c \ + display_status.c \ + duplicate_name.c \ + encapsulate.c \ + export_name.c \ + external.c \ + get_mic.c \ + gssapi.h \ + gssapi_locl.h \ + import_name.c \ + indicate_mechs.c \ + init.c \ + init_sec_context.c \ + inquire_context.c \ + inquire_cred.c \ + release_buffer.c \ + release_cred.c \ + release_name.c \ + release_oid_set.c \ + test_oid_set_member.c \ + unwrap.c \ + v1.c \ + verify_mic.c \ wrap.c diff --git a/lib/gssapi/krb5/Makefile.am b/lib/gssapi/krb5/Makefile.am index be72c6fef..d5b1efac8 100644 --- a/lib/gssapi/krb5/Makefile.am +++ b/lib/gssapi/krb5/Makefile.am @@ -1,43 +1,45 @@ # $Id$ -AUTOMAKE_OPTIONS = no-dependencies foreign +include $(top_srcdir)/Makefile.am.common -CFLAGS = @CFLAGS@ $(WFLAGS) - -INCLUDES = -I$(top_builddir)/include -I$(srcdir)/../krb5 +INCLUDES += -I$(srcdir)/../krb5 lib_LTLIBRARIES = libgssapi.la -libgssapi_la_SOURCES = \ - 8003.c \ - accept_sec_context.c \ - acquire_cred.c \ - add_oid_set_member.c \ - canonicalize_name.c \ - compare_name.c \ - context_time.c \ - create_emtpy_oid_set.c \ - decapsulate.c \ - delete_sec_context.c \ - display_name.c \ - display_status.c \ - duplicate_name.c \ - encapsulate.c \ - export_name.c \ - external.c \ - get_mic.c \ - import_name.c \ - indicate_mechs.c \ - init.c \ - init_sec_context.c \ - inquire_context.c \ - inquire_cred.c \ - release_buffer.c \ - release_cred.c \ - release_name.c \ - release_oid_set.c \ - test_oid_set_member.c \ - unwrap.c \ - v1.c \ - verify_mic.c \ +include_HEADERS = gssapi.h + +libgssapi_la_SOURCES = \ + 8003.c \ + accept_sec_context.c \ + acquire_cred.c \ + add_oid_set_member.c \ + canonicalize_name.c \ + compare_name.c \ + context_time.c \ + create_emtpy_oid_set.c \ + decapsulate.c \ + delete_sec_context.c \ + display_name.c \ + display_status.c \ + duplicate_name.c \ + encapsulate.c \ + export_name.c \ + external.c \ + get_mic.c \ + gssapi.h \ + gssapi_locl.h \ + import_name.c \ + indicate_mechs.c \ + init.c \ + init_sec_context.c \ + inquire_context.c \ + inquire_cred.c \ + release_buffer.c \ + release_cred.c \ + release_name.c \ + release_oid_set.c \ + test_oid_set_member.c \ + unwrap.c \ + v1.c \ + verify_mic.c \ wrap.c diff --git a/lib/hdb/Makefile.am b/lib/hdb/Makefile.am index a3ee28649..ea89bfc3c 100644 --- a/lib/hdb/Makefile.am +++ b/lib/hdb/Makefile.am @@ -1,12 +1,8 @@ # $Id$ -AUTOMAKE_OPTIONS = no-dependencies foreign +include $(top_srcdir)/Makefile.am.common -SUFFIXES = .x .et .h - -INCLUDES = $(WFLAGS) -I../asn1 -I$(srcdir)/../asn1 - -COMPILE_ET = ../com_err/compile_et +INCLUDES += -I../asn1 -I$(srcdir)/../asn1 BUILT_SOURCES = asn1_Key.c asn1_Event.c asn1_HDBFlags.c asn1_hdb_entry.c \ asn1_Salt.c hdb_err.c hdb_err.h @@ -28,37 +24,13 @@ lib_LTLIBRARIES = libhdb.la libhdb_la_SOURCES = hdb.c common.c db.c ndbm.c $(BUILT_SOURCES) include_HEADERS = hdb.h -incdir = $(includedir) -inc_DATA = hdb_err.h hdb_asn1.h +include__DATA = hdb_err.h hdb_asn1.h libhdb_la_LIBADD = -idir = $(top_builddir)/include - -all-local: $(inc_DATA) - @for i in $(inc_DATA); do \ - if cmp -s $$i $(idir)/$$i 2> /dev/null ; then :; else\ - echo " $(INSTALL_DATA) $$i $(idir)/$$i"; \ - $(INSTALL_DATA) $$i $(idir)/$$i; \ - fi ; \ - done - $(foo) hdb_asn1.h: asn1_files asn1_files: ../asn1/asn1_compile $(srcdir)/hdb.asn1 ../asn1/asn1_compile $(srcdir)/hdb.asn1 hdb_asn1 $(libhdb_la_OBJECTS): hdb_asn1.h hdb_err.h - -.x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ - -.et.h: - $(COMPILE_ET) $< - -.et.c: - $(COMPILE_ET) $< - -hdb_err.h: hdb_err.et - -hdb_err.c: hdb_err.et