summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.nmake2
-rw-r--r--epan/ftypes/CMakeLists.txt17
3 files changed, 10 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index 2e967ed121..d670444588 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1046,7 +1046,7 @@ checkapi: checkapi_local
## cd epan && $(MAKE) checkapi
cd epan/crypt && $(MAKE) checkapi
cd epan/dfilter && $(MAKE) checkapi
-## cd epan/ftypes && $(MAKE) checkapi
+ cd epan/ftypes && $(MAKE) checkapi
cd epan/wslua && $(MAKE) checkapi
cd epan/dissectors && $(MAKE) checkapi
cd plugins && $(MAKE) checkapi
diff --git a/Makefile.nmake b/Makefile.nmake
index a55c9d1be1..d88ff4234d 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1516,7 +1516,7 @@ checkapi: checkapi_local
cd ../dfilter
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
cd ../ftypes
-## $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
cd ../wslua
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
cd ../dissectors
diff --git a/epan/ftypes/CMakeLists.txt b/epan/ftypes/CMakeLists.txt
index 6ddcb9fbee..9f1d62f294 100644
--- a/epan/ftypes/CMakeLists.txt
+++ b/epan/ftypes/CMakeLists.txt
@@ -58,15 +58,14 @@ set_target_properties(ftypes PROPERTIES
COMPILE_DEFINITIONS "WS_BUILD_DLL"
)
-# Commented out as per nmake
-#CHECKAPI(
-# NAME
-# ftypes
-# SWITCHES
-# -g termoutput -build
-# SOURCES
-# ${FTYPE_FILES}
-#)
+CHECKAPI(
+ NAME
+ ftypes
+ SWITCHES
+ -g termoutput -build
+ SOURCES
+ ${FTYPE_FILES}
+)
#
# Editor modelines - http://www.wireshark.org/tools/modelines.html