aboutsummaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorDavid Karoly <david.karoly@outlook.com>2023-02-13 15:08:37 +0100
committerDavid Karoly <david.karoly@outlook.com>2023-02-14 19:18:21 +0100
commit5208f77d33ebc10d6b9f0989ee3a78a3982c0a6e (patch)
treeac1dbe73aad9b37bb7a0bda59349d46d85770baa /Makefile.in
parentb2de9a470750ce08d61ab141cc65abe68d2988c5 (diff)
autoconf: remove check for C++ compiler on Haiku
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in9
1 files changed, 3 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in
index 771aef70..35e8e19f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -70,7 +70,6 @@ INSTALL_RPCAPD=@INSTALL_RPCAPD@
# Standard CFLAGS for building members of a shared library
FULL_CFLAGS = $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
-CXXFLAGS = $(CCOPT) @V_LIB_CCOPT_FAT@ $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -88,7 +87,6 @@ BISON_BYACC = @BISON_BYACC@
$(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
PLATFORM_C_SRC = @PLATFORM_C_SRC@
-PLATFORM_CXX_SRC = @PLATFORM_CXX_SRC@
MODULE_C_SRC = @MODULE_C_SRC@
REMOTE_C_SRC = @REMOTE_C_SRC@
COMMON_C_SRC = pcap.c gencode.c optimize.c nametoaddr.c etherent.c \
@@ -98,14 +96,13 @@ COMMON_C_SRC = pcap.c gencode.c optimize.c nametoaddr.c etherent.c \
GENERATED_C_SRC = scanner.c grammar.c
LIBOBJS = @LIBOBJS@
-SRC = $(PLATFORM_C_SRC) $(PLATFORM_CXX_SRC) \
+SRC = $(PLATFORM_C_SRC) \
$(MODULE_C_SRC) $(REMOTE_C_SRC) $(COMMON_C_SRC) \
$(GENERATED_C_SRC)
# We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
-# hack the extra indirection, and we have to handle PLATFORM_CXX_SRC
-# differently from the defines for C source
-OBJ = $(PLATFORM_C_SRC:.c=.o) $(PLATFORM_CXX_SRC:.cpp=.o) \
+# hack the extra indirection
+OBJ = $(PLATFORM_C_SRC:.c=.o) \
$(MODULE_C_SRC:.c=.o) $(REMOTE_C_SRC:.c=.o) $(COMMON_C_SRC:.c=.o) \
$(GENERATED_C_SRC:.c=.o) \
$(LIBOBJS)