diff options
Diffstat (limited to 'epan/dissectors/asn1/x721')
| -rw-r--r-- | epan/dissectors/asn1/x721/Makefile.am | 19 | ||||
| -rw-r--r-- | epan/dissectors/asn1/x721/Makefile.common | 33 |
2 files changed, 16 insertions, 36 deletions
diff --git a/epan/dissectors/asn1/x721/Makefile.am b/epan/dissectors/asn1/x721/Makefile.am index 11932c53a4..3bba1491e9 100644 --- a/epan/dissectors/asn1/x721/Makefile.am +++ b/epan/dissectors/asn1/x721/Makefile.am @@ -16,7 +16,20 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -include ../Makefile.preinc -include Makefile.common include ../Makefile.inc + +#Dummy entry to pass the clean target +PROTOCOL_NAME = dummy + +ASN_FILE_LIST = + +INCLUDED_ASN_FILE_LIST = + +EXTRA_DIST = \ + $(EXTRA_DIST_COMMON) \ + $(ASN_FILE_LIST) \ + $(INCLUDED_ASN_FILE_LIST) \ + Attribute-ASN1Module.asn \ + ManagedObjectClassesDefinitions.asn \ + Notification-ASN1Module.asn \ + Parameter-ASN1Module.asn diff --git a/epan/dissectors/asn1/x721/Makefile.common b/epan/dissectors/asn1/x721/Makefile.common deleted file mode 100644 index 5da5ac8d33..0000000000 --- a/epan/dissectors/asn1/x721/Makefile.common +++ /dev/null @@ -1,33 +0,0 @@ -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -#Dummy entry to pass the clean target -PROTOCOL_NAME = dummy - -ASN_FILE_LIST = - -INCLUDED_ASN_FILE_LIST = - -EXTRA_DIST = \ - $(EXTRA_DIST_COMMON) \ - $(ASN_FILE_LIST) \ - $(INCLUDED_ASN_FILE_LIST) \ - Attribute-ASN1Module.asn \ - ManagedObjectClassesDefinitions.asn \ - Notification-ASN1Module.asn \ - Parameter-ASN1Module.asn |