Arrange that "x11-declarations.h" and "x11-register-info.h" be part of
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 27 Jul 2004 02:52:49 +0000 (02:52 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 27 Jul 2004 02:52:49 +0000 (02:52 +0000)
the distribution, as was the case in the past.

Arrange that RCS IDs be expanded, and that the EOL style be native, for
epan/dissectors/Makefile.{am,common,nmake}.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11532 f5534014-38df-0310-8fa8-9805f1628bb7

epan/Makefile.am
epan/dissectors/Makefile.am
epan/dissectors/Makefile.common
epan/dissectors/Makefile.nmake

index 5fd9396ac6993047224769e8b7885c4fb13ad3f8..09f595e488365c2412851b120d01b693254ee1e1 100644 (file)
@@ -114,8 +114,6 @@ EXTRA_DIST = \
 CLEANFILES = \
        libethereal.a           \
        libethereal.la          \
-       x11-declarations.h      \
-       x11-register-info.h     \
        *~
 
 MAINTAINERCLEANFILES = \
index 186a4cfd514f94fec56d8fae20a23c4d01dd7250..192035f7795dd6727883a426d4cc0c236fdba2be 100644 (file)
@@ -3,9 +3,8 @@
 # $Id$
 #
 # Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@zing.org>
+# By Gerald Combs <gerald@ethereal.com>
 # Copyright 2004 Gerald Combs
-#
 # 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -113,6 +112,5 @@ MAINTAINERCLEANFILES =      \
 CLEANFILES = \
        libdissectors.a         \
        libdissectors.la        \
-       x11-declarations.h      \
-       x11-register-info.h     \
+       $(GENERATED_HEADER_FILES)       \
        *~
index 03ddacf682cc5d933f49ca5b0e127dae50d05713..9a9c156a1a7a6b22b78f012d4216454f26cf65d0 100644 (file)
@@ -3,7 +3,7 @@
 #     a) common to both files and
 #     b) portable between both files
 #
-# $Id: Makefile.common 11400 2004-07-18 00:24:25Z guy $
+# $Id$
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#
+# Generated header files that we want in the distribution.
+#
+GENERATED_HEADER_FILES = \
+       x11-declarations.h      \
+       x11-register-info.h
 
 # the dissector sources (without any helpers)
 DISSECTOR_SRC =        \
@@ -691,7 +697,8 @@ DISSECTOR_INCLUDES =        \
        packet-ypbind.h \
        packet-yppasswd.h       \
        packet-ypserv.h \
-       packet-ypxfr.h
+       packet-ypxfr.h  \
+       $(GENERATED_HEADER_FILES)
 
 # dissector helpers (needed from the dissectors, but not a dissector itself)
 DISSECTOR_SUPPORT_SRC =        \
index 98c668934369d906aad2aff7c95e22eb3974ed50..13445d5508ef86fe295183673ee928c34b57aaf1 100644 (file)
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake 11400 2004-07-18 00:24:25Z guy $
+# $Id$
 
 include ..\..\config.nmake
 
@@ -24,7 +24,7 @@ DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
 
 #dissectors.lib: ../../config.h $(DISSECTOR_OBJECTS) $(EXTRA_OBJECTS)
-dissectors.lib: register.obj packet-ncp2222.c x11-declarations.h x11-register-info.h ../../config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
+dissectors.lib: register.obj packet-ncp2222.c $(GENERATED_HEADER_FILES) ../../config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
        @echo Linking dissectors.lib
        link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
 
@@ -100,4 +100,4 @@ clean:
 
 distclean: clean
        rm -f $(BUILT_SOURCES) packet-ncp2222.c \
-               register.c x11-declarations.h x11-register-info.h
+               register.c $(GENERATED_HEADER_FILES)