aboutsummaryrefslogtreecommitdiffstats
path: root/epan/crypt
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2010-11-30 02:04:55 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2010-11-30 02:04:55 +0000
commitc755b2fd545401b80268af4f13a60d77fc91c949 (patch)
treea77d614c25713268240deeedfcdc2e61d107fda5 /epan/crypt
parenta857d6d69b4042c9ed98891988112e1ec7ba4e94 (diff)
Oh yeah, there's a reason we don't put targets in Makefile.common: the first target in a makefile is what you get when you just run make (without a target). Revert 35073 and 35069.
svn path=/trunk/; revision=35075
Diffstat (limited to 'epan/crypt')
-rw-r--r--epan/crypt/Makefile.am6
-rw-r--r--epan/crypt/Makefile.common5
-rw-r--r--epan/crypt/Makefile.nmake8
3 files changed, 11 insertions, 8 deletions
diff --git a/epan/crypt/Makefile.am b/epan/crypt/Makefile.am
index cb06d2cfab..8db3475004 100644
--- a/epan/crypt/Makefile.am
+++ b/epan/crypt/Makefile.am
@@ -47,4 +47,8 @@ libairpdcap_la_SOURCES = \
EXTRA_DIST = \
Makefile.common \
- Makefile.nmake
+ Makefile.nmake
+
+checkapi:
+ $(PERL) ../../tools/checkAPIs.pl -g termoutput \
+ $(LIBAIRPDCAP_SRC)
diff --git a/epan/crypt/Makefile.common b/epan/crypt/Makefile.common
index 7a714eae4d..93c5f65537 100644
--- a/epan/crypt/Makefile.common
+++ b/epan/crypt/Makefile.common
@@ -52,8 +52,3 @@ LIBAIRPDCAP_INCLUDES = \
crypt-rc4.h \
crypt-sha1.h \
wep-wpadefs.h
-
-
-checkapi:
- $(PERL) ../../tools/checkAPIs.pl -g termoutput \
- $(LIBAIRPDCAP_SRC)
diff --git a/epan/crypt/Makefile.nmake b/epan/crypt/Makefile.nmake
index 1817ab65f5..b05773a2cf 100644
--- a/epan/crypt/Makefile.nmake
+++ b/epan/crypt/Makefile.nmake
@@ -15,8 +15,8 @@ CFLAGS=-WX -DHAVE_CONFIG_H $(GLIB_CFLAGS) -D_U_="" /I../.. $(LOCAL_CFLAGS)
AIRPDCAP_OBJECTS = $(LIBAIRPDCAP_SRC:.c=.obj)
-airpdcap.lib: $(AIRPDCAP_OBJECTS)
- link /lib /out:airpdcap.lib $(AIRPDCAP_OBJECTS)
+airpdcap.lib: $(AIRPDCAP_OBJECTS)
+ link /lib /out:airpdcap.lib $(AIRPDCAP_OBJECTS)
clean:
rm -f $(AIRPDCAP_OBJECTS) airpdcap.lib *.pdb
@@ -24,3 +24,7 @@ clean:
distclean: clean
maintainer-clean: distclean
+
+checkapi:
+ $(PERL) ../../tools/checkAPIs.pl -g termoutput \
+ $(LIBAIRPDCAP_SRC)