diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-05-29 03:33:28 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-05-29 03:33:28 +0000 |
| commit | 578810d5a7cca0e3d63e35580472fac7568d51d4 (patch) | |
| tree | 993381258163cbced0bd44746432785126cb005f /wsutil | |
| parent | 0bea22c025f276481f7f5f297190f3c54f5c5953 (diff) | |
Put the optional objects in EXTRA..SOURCES instead of EXTRA_DIST.
Put the optional objects in a _DEPENDENCIES rule so they actually get built
when needed.
Use libtool to make these objects. Remove AC variables that are no longer
needed.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33017 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | wsutil/Makefile.am | 38 |
2 files changed, 25 insertions, 21 deletions
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 4bef18437d..887396807f 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -29,13 +29,13 @@ IF(WIN32) ENDIF(WIN32) set(WSUTIL_FILES -# @GETOPT_O@ # wsgetopt.c +# @GETOPT_LO@ # wsgetopt.c # @INET_ATON_LO@ # inet_aton.c # @INET_NTOP_LO@ # inet_ntop.c # @INET_PTON_LO@ # inet_pton.c -# @STRERROR_O@ # strerror.c -# @STRNCASECMP_O@ # strncasecmp.c -# @STRPTIME_O@ # strptime.c +# @STRERROR_LO@ # strerror.c +# @STRNCASECMP_LO@ # strncasecmp.c +# @STRPTIME_LO@ # strptime.c mpeg-audio.c privileges.c str_util.c diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index e4d42bd6d4..a813ee5ab7 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -31,12 +31,13 @@ endif # Optional objects that I know how to build. These will be # linked into libwsutil. wsutil_optional_objects = \ - @GETOPT_O@ \ - @STRERROR_O@ \ - @STRNCASECMP_O@ \ - @STRPTIME_O@ \ + @GETOPT_LO@ \ + @INET_ATON_LO@ \ + @INET_NTOP_LO@ \ @INET_PTON_LO@ \ - @INET_NTOP_LO@ + @STRERROR_LO@ \ + @STRNCASECMP_LO@ \ + @STRPTIME_LO@ lib_LTLIBRARIES = libwsutil.la @@ -48,7 +49,20 @@ libwsutil_la_SOURCES = \ EXTRA_libwsutil_la_SOURCES= \ inet_aton.c \ - inet_aton.h + inet_aton.h \ + inet_ntop.c \ + inet_pton.c \ + inet_v6defs.h \ + strerror.c \ + strerror.h \ + strncasecmp.c \ + strptime.c \ + strptime.h \ + wsgetopt.c \ + wsgetopt.h + +libwsutil_la_DEPENDENCIES= \ + $(wsutil_optional_objects) libwsutil_la_LIBADD = \ @GLIB_LIBS@ \ @@ -59,19 +73,9 @@ EXTRA_DIST = \ Makefile.nmake \ file_util.c \ file_util.h \ - inet_ntop.c \ - inet_pton.c \ - inet_v6defs.h \ libwsutil.def \ - strerror.c \ - strerror.h \ - strncasecmp.c \ - strptime.c \ - strptime.h \ unicode-utils.c \ - unicode-utils.h \ - wsgetopt.c \ - wsgetopt.h + unicode-utils.h CLEANFILES = \ libwsutil.a \ |