diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-11-23 19:08:51 -0500 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-11-23 19:08:51 -0500 |
| commit | 5d1c958ce2dcc0f28c1bd13b8e005c0c2ad1cdba (patch) | |
| tree | e44ad8807e0b5b2e1bb85682f677d492f1195dbf /Makefile.in | |
| parent | 562d60b004e3d7ae73c1c7508be529006bd6430f (diff) | |
| parent | 90bba7158de040705a101ba1fdf6062866b4b4e9 (diff) | |
| download | systemtap-steved-5d1c958ce2dcc0f28c1bd13b8e005c0c2ad1cdba.tar.gz systemtap-steved-5d1c958ce2dcc0f28c1bd13b8e005c0c2ad1cdba.tar.xz systemtap-steved-5d1c958ce2dcc0f28c1bd13b8e005c0c2ad1cdba.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Conflicts:
configure
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 4cd5c10d..5b0fbaf1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -280,7 +280,6 @@ PIECFLAGS = @PIECFLAGS@ PIECXXFLAGS = @PIECXXFLAGS@ PIELDFLAGS = @PIELDFLAGS@ PKG_CONFIG = @PKG_CONFIG@ -PROCFLAGS = @PROCFLAGS@ RANLIB = @RANLIB@ RPM_CFLAGS = @RPM_CFLAGS@ RPM_LIBS = @RPM_LIBS@ @@ -403,19 +402,18 @@ staprun_SOURCES = runtime/staprun/staprun.c \ runtime/staprun/staprun_funcs.c runtime/staprun/ctl.c \ runtime/staprun/common.c $(am__append_16) staprun_CPPFLAGS = $(AM_CPPFLAGS) -staprun_CFLAGS = @PROCFLAGS@ $(AM_CFLAGS) @PIECFLAGS@ \ - -DSINGLE_THREADED -fno-strict-aliasing -fno-builtin-strftime \ - $(am__append_17) +staprun_CFLAGS = $(AM_CFLAGS) @PIECFLAGS@ -DSINGLE_THREADED \ + -fno-strict-aliasing -fno-builtin-strftime $(am__append_17) staprun_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ -staprun_LDADD = @PROCFLAGS@ $(am__append_18) +staprun_LDADD = $(am__append_18) stapio_SOURCES = runtime/staprun/stapio.c \ runtime/staprun/mainloop.c runtime/staprun/common.c \ runtime/staprun/ctl.c \ runtime/staprun/relay.c runtime/staprun/relay_old.c -stapio_CFLAGS = @PROCFLAGS@ $(AM_CFLAGS) @PIECFLAGS@ -fno-strict-aliasing -fno-builtin-strftime +stapio_CFLAGS = $(AM_CFLAGS) @PIECFLAGS@ -fno-strict-aliasing -fno-builtin-strftime stapio_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ -stapio_LDADD = @PROCFLAGS@ -lpthread +stapio_LDADD = -lpthread @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_sign_module_SOURCES = modsign.cxx nsscommon.c @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_sign_module_CPPFLAGS = -Wall -Werror $(AM_CPPFLAGS) $(nss_CFLAGS) $(nspr_CFLAGS) @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_sign_module_LDADD = -lnss3 -lnspr4 |