aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>2007-01-12 05:47:12 +0000
committerulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>2007-01-12 05:47:12 +0000
commitccc3d50afe114174d009bb4cd9e9d71357d59cb2 (patch)
tree395ee314d54b8847d2b924578daa0743955a3b57 /wiretap
parent6e51586ef635711e2c26051f36fcced3de408272 (diff)
second try for file_util.c ... (at least OS X didn't liked it)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20403 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/Makefile.am1
-rw-r--r--wiretap/Makefile.common3
-rw-r--r--wiretap/Makefile.nmake2
3 files changed, 2 insertions, 4 deletions
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 7eed00c9db..80317147bd 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -51,6 +51,7 @@ EXTRA_DIST = \
Makefile.common \
Makefile.nmake \
wtap.def \
+ file_util.c \
$(GENERATED_FILES)
# Any POSIX-compatible YACC should honor the -p flag
diff --git a/wiretap/Makefile.common b/wiretap/Makefile.common
index dc97cae87d..176adf7f54 100644
--- a/wiretap/Makefile.common
+++ b/wiretap/Makefile.common
@@ -105,9 +105,6 @@ NONGENERATED_HEADER_FILES = \
wtap-capture.h \
wtap-int.h
-EXTRA_DIST = \
- file_util.c
-
# Files that generate compileable files
GENERATOR_SOURCES = \
ascend-grammar.y \
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index 9ace44d74a..4a07e477e6 100644
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -17,7 +17,7 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
-OBJECTS=$(NONGENERATED_C_FILES:.c=.obj) $(GENERATED_C_FILES:.c=.obj) $(EXTRA_DIST:.c=.obj)
+OBJECTS=$(NONGENERATED_C_FILES:.c=.obj) $(GENERATED_C_FILES:.c=.obj) file_util.obj
wiretap_LIBS = \
$(GLIB_LIBS) \