adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-06-26 04:52:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the Makefile for --disable-perl

Browse Source 
We still had modperl in FILES and thus tried to compile / install it

To avoid an endless loop I need := instead of = on the assignment with sed.
For consistency I changed all the others too (this should also be faster).



git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@861 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2007-11-03 20:19:19 +00:00
parent a213258c99
commit 8100ef945c
2 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.in
+10 -10
View File
@@ -1,16 +1,16 @@
CXX = @CXX@
CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@
INCLUDES = @INCLUDES@
LIBS = @LIBS@
prefix = @prefix@
CXX := @CXX@
CXXFLAGS := @CXXFLAGS@
LDFLAGS := @LDFLAGS@
INCLUDES := @INCLUDES@
LIBS := @LIBS@
prefix := @prefix@
SRCS = String.cpp Csocket.cpp main.cpp znc.cpp User.cpp IRCSock.cpp Client.cpp DCCBounce.cpp \
SRCS := String.cpp Csocket.cpp main.cpp znc.cpp User.cpp IRCSock.cpp Client.cpp DCCBounce.cpp \
DCCSock.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp MD5.cpp Buffer.cpp Utils.cpp \
FileUtils.cpp HTTPSock.cpp Template.cpp
OBJS = $(patsubst %cpp,%o,$(SRCS))
CLEAN = znc znc-static *.o core core.*
DISTCLEAN = Makefile config.log config.status znc-config .depend \
OBJS := $(patsubst %cpp,%o,$(SRCS))
CLEAN := znc znc-static *.o core core.*
DISTCLEAN := Makefile config.log config.status znc-config .depend \
modules/.depend modules/Makefile
.PHONY: all modules clean distclean install depend
modules/Makefile.in
+23 -22
View File
@@ -1,35 +1,36 @@
CXX = @CXX@
CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@
INCLUDES = @INCLUDES@ -I..
LIBS = @LIBS@
PERL = @PERL@
MODDIR = @MODDIR@
prefix = @prefix@
ifneq "$(PERL)" ""
PERLCC = -DHAVE_PERL `$(PERL) -MExtUtils::Embed -e perl_inc`
PERLLD = `$(PERL) -MExtUtils::Embed -e perl_inc -e ldopts`
PERLHOOK = modperl_install
else
PERLHOOK =
endif
CXX := @CXX@
CXXFLAGS := @CXXFLAGS@
LDFLAGS := @LDFLAGS@
INCLUDES := @INCLUDES@ -I..
LIBS := @LIBS@
PERL := @PERL@
MODDIR := @MODDIR@
prefix := @prefix@
ifeq "@NOSSL@" "1"
FILES = $(foreach file, $(wildcard *.cpp), \
FILES := $(foreach file, $(wildcard *.cpp), \
$(if $(shell grep REQUIRESSL $(file)), \
, \
$(basename $(file)) \
))
else
FILES = $(basename $(wildcard *.cpp))
FILES := $(basename $(wildcard *.cpp))
endif
SRCS = $(wildcard ../*.cpp) $(addsuffix .cpp, $(FILES))
OBJS = $(addsuffix .o, $(FILES))
TARGETS = $(addsuffix .so, $(FILES))
ifneq "$(PERL)" ""
PERLCC := -DHAVE_PERL `$(PERL) -MExtUtils::Embed -e perl_inc`
PERLLD := `$(PERL) -MExtUtils::Embed -e perl_inc -e ldopts`
PERLHOOK := modperl_install
else
PERLHOOK :=
FILES := $(shell echo $(FILES) | sed -e "s/modperl//")
endif
CLEAN = *.so *.o
SRCS := $(wildcard ../*.cpp) $(addsuffix .cpp, $(FILES))
OBJS := $(addsuffix .o, $(FILES))
TARGETS := $(addsuffix .so, $(FILES))
CLEAN := *.so *.o
.PHONY: all clean install depend modperl_install