diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-05-18 16:20:36 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-05-18 16:20:36 +0000 |
| commit | af87b318523b55bcbfa3c4d62f13b2cae525095c (patch) | |
| tree | 7509b54b4e3a81e202744079d2e6eb92cc4b4b90 /epan | |
| parent | fb8054f13114a94b356f7ad0176fa981c0389de8 (diff) | |
Allow custom dissectors in automake too.
svn path=/trunk/; revision=42707
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/Custom.common (renamed from epan/dissectors/Custom.nmake) | 0 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.am | 2 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.common | 2 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.nmake | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/Custom.nmake b/epan/dissectors/Custom.common index 54ad11b79f..54ad11b79f 100644 --- a/epan/dissectors/Custom.nmake +++ b/epan/dissectors/Custom.common diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am index 10f2415103..4b21c50eee 100644 --- a/epan/dissectors/Makefile.am +++ b/epan/dissectors/Makefile.am @@ -47,7 +47,7 @@ libdissectors_la_CFLAGS = $(AM_CLEAN_CFLAGS) DIST_SUBDIRS = dcerpc pidl EXTRA_DIST = \ - Custom.nmake \ + Custom.common \ Makefile.common \ Makefile.nmake \ packet-ncp2222.inc \ diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index a3c5d6a41c..217d24c97d 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -23,7 +23,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -include Custom.nmake +include Custom.common # "BUILT_SOURCES" are built before any "make all" or "make check" targets. BUILT_C_FILES = \ diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake index a9299422bd..2004965e10 100644 --- a/epan/dissectors/Makefile.nmake +++ b/epan/dissectors/Makefile.nmake @@ -7,7 +7,7 @@ include ..\..\config.nmake ############### no need to modify below this line ######### -include Custom.nmake +include Custom.common include Makefile.common |