From 1448e2486e9a2ad6cf6fa6d5ddbef203118b2c9b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 6 Feb 2009 18:55:05 +0100 Subject: make all cflags and libs variables uppercase pkg-config uses uppercase for its _CFLAGS and _LIBS variable names. So we follow suit and convert all _cflags and _libs variables to uppercase for more consistency. --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index a3a6e19b..dd3a60bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ lmtcpsrv_la_SOURCES = \ tcps_sess.h \ tcpsrv.c \ tcpsrv.h -lmtcpsrv_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags) +lmtcpsrv_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) lmtcpsrv_la_LDFLAGS = -module -avoid-version lmtcpsrv_la_LIBADD = @@ -23,7 +23,7 @@ lmtcpsrv_la_LIBADD = lmtcpclt_la_SOURCES = \ tcpclt.c \ tcpclt.h -lmtcpclt_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags) +lmtcpclt_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) lmtcpclt_la_LDFLAGS = -module -avoid-version lmtcpclt_la_LIBADD = @@ -35,9 +35,9 @@ endif # if ENABLE_INET if ENABLE_GSSAPI pkglib_LTLIBRARIES += lmgssutil.la lmgssutil_la_SOURCES = gss-misc.c gss-misc.h -lmgssutil_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags) +lmgssutil_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) lmgssutil_la_LDFLAGS = -module -avoid-version -lmgssutil_la_LIBADD = $(gss_libs) +lmgssutil_la_LIBADD = $(GSS_LIBS) endif EXTRA_DIST = \ -- cgit From 6685cd0c482f4fbd2e0e750f05e2c847a7a417e5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 6 Feb 2009 19:35:51 +0100 Subject: Split the m4 macros into a separate directory --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index dd3a60bc..d783a30e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -107,3 +107,5 @@ endif # tests are added as last element, because tests may need different # modules that need to be generated first SUBDIRS += tests + +ACLOCAL_AMFLAGS = -I m4 -- cgit