aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-10-10 13:16:04 +0000
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-10-10 13:16:04 +0000
commit114ab34085be4cde30731f22c5fc62353abbb387 (patch)
tree6545636461b78c894f280d74583880e50aa7502d /asn1
parentbf11c4f10c87e627a532ad7478d590179592f9f8 (diff)
Update makefiles to reflect new names
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30474 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
-rw-r--r--asn1/Makefile.am10
-rw-r--r--asn1/Makefile.nmake32
2 files changed, 21 insertions, 21 deletions
diff --git a/asn1/Makefile.am b/asn1/Makefile.am
index 363ffc5c15..ef28da42e0 100644
--- a/asn1/Makefile.am
+++ b/asn1/Makefile.am
@@ -31,16 +31,18 @@ SUBDIRS = \
cdt \
charging_ase \
cmip \
+ cmp \
+ crmf \
cms \
dap \
- disp \
dop \
+ disp \
dsp \
ess \
ftam \
gnm \
goose \
- gsmmap \
+ gsm_map \
h225 \
h235 \
h245 \
@@ -54,7 +56,7 @@ SUBDIRS = \
h501 \
inap \
ldap \
- logotype-cert-extn \
+ logotypecertextn \
lte-rrc \
mms \
mpeg-audio \
@@ -69,8 +71,6 @@ SUBDIRS = \
pkinit \
pkix1explicit \
pkix1implicit \
- pkixcmp \
- pkixcrmf \
pkixproxy \
pkixqualified \
pkixtsp \
diff --git a/asn1/Makefile.nmake b/asn1/Makefile.nmake
index 7133119329..699d0a02ce 100644
--- a/asn1/Makefile.nmake
+++ b/asn1/Makefile.nmake
@@ -26,14 +26,16 @@
all: ber per
ber: \
- acse \
acp133 \
+ acse \
ansi_map \
ansi_tcap \
camel \
cdt \
charging_ase \
cmip \
+ cmp \
+ crmf \
cms \
dap \
dop \
@@ -43,11 +45,11 @@ ber: \
ftam \
gnm \
goose \
- gsmmap \
+ gsm_map \
h248 \
inap \
ldap \
- logotype-cert-extn \
+ logotypecertextn \
mms \
ns-cert-exts \
ocsp \
@@ -57,8 +59,6 @@ ber: \
pkinit \
pkix1explicit \
pkix1implicit \
- pkixcmp \
- pkixcrmf \
pkixproxy \
pkixqualified \
pkixtsp \
@@ -157,7 +157,7 @@ clean:
cd gnm
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ..
- cd gsmmap
+ cd gsm_map
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ..
cd h225
@@ -205,7 +205,7 @@ clean:
cd kerberos
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ..
- cd logotype-cert-extn
+ cd logotypecertextn
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ..
cd mms
@@ -247,10 +247,10 @@ clean:
cd pkix1implicit
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ..
- cd pkixcmp
+ cd cmp
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ..
- cd pkixcrmf
+ cd crmf
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ..
cd pkixproxy
@@ -436,7 +436,7 @@ goose::
cd ..
gsmmap::
- cd gsmmap
+ cd gsm_map
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
cd ..
@@ -515,8 +515,8 @@ lte-rrc::
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
cd ..
-logotype-cert-extn::
- cd logotype-cert-extn
+logotypecertextn::
+ cd logotypecertextn
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
cd ..
@@ -585,13 +585,13 @@ pkix1implicit::
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
cd ..
-pkixcmp::
- cd pkixcmp
+cmp::
+ cd cmp
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
cd ..
-pkixcrmf::
- cd pkixcrmf
+crmf::
+ cd crmf
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
cd ..