osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Rename DISSECTOR_ASM_UTILS to LIBWIRESHARK_ASM_FILES since these files belongs to epan not dissectors 

svn path=/trunk/; revision=30443
This commit is contained in:
Kovarththanan Rajaratnam 2009-10-09 19:43:42 +00:00
parent b04e327795
commit e5a1fa3d94
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
epan/CMakeLists.txt
View File

@ -968,20 +968,6 @@ set(DISSECTOR_SUPPORT_SRC
register.c
)
set(DISSECTOR_ASM_UTILS
asm_utils.c
# !IFDEF NASM
# asm_utils_win32_x86.obj: asm_utils_win32_x86.asm
# $(NASM) -f $(WIRESHARK_TARGET_PLATFORM) -o $@ $?
# !ENDIF
# ...
# !IF defined(NASM) && "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
# asm_utils_win32_x86.obj
# !ELSE
# asm_utils.obj
# !ENDIF
)
set(DISSECTOR_FILES
${DISSECTOR_SRC}
${PIDL_DISSECTOR_SRC}
@ -991,7 +977,7 @@ set(DISSECTOR_FILES
)
set_source_files_properties(
${DISSECTOR_SRC}
${DISSECTOR_SRC}
${PIDL_DISSECTOR_SRC}
${ASN1_DISSECTOR_SRC}
PROPERTIES
@ -1015,6 +1001,20 @@ ADD_CUSTOM_COMMAND(
make-sminmpec.pl
)
set(LIBWIRESHARK_ASM_FILES
asm_utils.c
# !IFDEF NASM
# asm_utils_win32_x86.obj: asm_utils_win32_x86.asm
# $(NASM) -f $(WIRESHARK_TARGET_PLATFORM) -o $@ $?
# !ENDIF
# ...
# !IF defined(NASM) && "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
# asm_utils_win32_x86.obj
# !ELSE
# asm_utils.obj
# !ENDIF
)
set(LIBWIRESHARK_FILES
addr_and_mask.c
addr_resolv.c
@ -1129,10 +1129,9 @@ add_library(epan SHARED
#x11-declarations.h
#x11-register-info.h
${LIBWIRESHARK_FILES}
${FTYPE_FILES}
${LIBWIRESHARK_ASM_FILES}
${DISSECTOR_FILES}
${DISSECTOR_SUPPORT_SRC}
${DISSECTOR_ASM_UTILS}
)
# In case we want the libwireshark name back
# SET_TARGET_PROPERTIES(epan PROPERTIES OUTPUT_NAME "wireshark")