diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-14 15:43:33 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-14 15:43:33 +0000 |
| commit | 538a97c5f6063de9ef9329bb5eb2a4f21675ef42 (patch) | |
| tree | 91f1e2b5aaaa9aa00bdc14f6ead070395254909b | |
| parent | da8c1c9fbe9e63bb286e86584bf48082b328162c (diff) | |
Set correct locale in make-version.pl instead of in Makefiles.
Added back add_custom_command for svnversion.h.
Removed unnecessary text2pcap_CLEAN_FILES.
Fix indent for ps.c command.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31525 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | CMakeLists.txt | 30 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.nmake | 1 | ||||
| -rwxr-xr-x | make-version.pl | 1 |
4 files changed, 20 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ed2dd72c0..5f59791808 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -397,7 +397,16 @@ link_directories( ADD_CUSTOM_TARGET( svnversion ALL - COMMAND LANG=C ${PERL} + COMMAND ${PERL} + ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl + ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl +) + +ADD_CUSTOM_COMMAND( + OUTPUT svnversion.h + COMMAND ${PERL} ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS @@ -409,14 +418,14 @@ register_tap_files(tshark-tap-register.c ) ADD_CUSTOM_COMMAND( - OUTPUT ps.c - COMMAND ${PYTHON_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/tools/rdps.py - ${CMAKE_CURRENT_SOURCE_DIR}/print.ps - ps.c + OUTPUT ps.c + COMMAND ${PYTHON_EXECUTABLE} + ${CMAKE_CURRENT_SOURCE_DIR}/tools/rdps.py + ${CMAKE_CURRENT_SOURCE_DIR}/print.ps + ps.c DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/tools/rdps.py - ${CMAKE_CURRENT_SOURCE_DIR}/print.ps + ${CMAKE_CURRENT_SOURCE_DIR}/tools/rdps.py + ${CMAKE_CURRENT_SOURCE_DIR}/print.ps ) if(UNIX) @@ -658,9 +667,6 @@ if(BUILD_text2pcap) set(text2pcap_FILES text2pcap.c ) - set(text2pcap_CLEAN_FILES - ${text2pcap_FILES} - ) add_lex_files(text2pcap_FILES text2pcap-scanner.l ) @@ -850,7 +856,7 @@ set(CLEAN_FILES ${rawshark_FILES} ${dftest_FILES} ${randpkt_FILES} - ${text2pcap_CLEAN_FILES} + ${text2pcap_FILES} ${mergecap_FILES} ${capinfos_FILES} ${editcap_FILES} diff --git a/Makefile.am b/Makefile.am index 61b8e7934b..3cd33e4133 100644 --- a/Makefile.am +++ b/Makefile.am @@ -498,7 +498,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \ FORCE: svnversion.h: FORCE - LANG=C $(PERL) $(srcdir)/make-version.pl $(srcdir) + $(PERL) $(srcdir)/make-version.pl $(srcdir) # # Build shell scripts by doing variable substitution. diff --git a/Makefile.nmake b/Makefile.nmake index a19af023e6..1ab04581ba 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -396,7 +396,6 @@ SVNENTRIES = !ENDIF svnversion.h: $(SVNENTRIES) rm -f svnversion.h - set LANG=C $(PERL) make-version.pl diff --git a/make-version.pl b/make-version.pl index 45312cc8f1..48eca2debc 100755 --- a/make-version.pl +++ b/make-version.pl @@ -81,6 +81,7 @@ my %version_pref = ( ); my $srcdir = "."; +$ENV{LANG} = "C"; # Ensure we run with correct locale # Run "svn info". Parse out the most recent modification time and the # revision number. |