diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-09-16 20:16:26 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-09-16 20:16:26 +0000 |
| commit | 558a44bf47370b68b14d0837bfae13c651ecf5c4 (patch) | |
| tree | 4426a7bdf2225137d3f9a2eac69fc49624c0207f /make | |
| parent | c90f2b28d2224c1147d51a1d223a7b9082565cc6 (diff) | |
Merge commands and modules in source, since they are already merged in install
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11734 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'make')
| -rw-r--r-- | make/bsd-real.mk | 5 | ||||
| -rwxr-xr-x | make/calcdep.pl | 2 | ||||
| -rw-r--r-- | make/gnu-real.mk | 7 |
3 files changed, 4 insertions, 10 deletions
diff --git a/make/bsd-real.mk b/make/bsd-real.mk index 13cb2cce8..1ea3e2916 100644 --- a/make/bsd-real.mk +++ b/make/bsd-real.mk @@ -1,6 +1,5 @@ VPATH = $(SOURCEPATH)/src CORE_TARGS != perl -e 'chdir "$$ENV{SOURCEPATH}/src"; print join " ", grep s/\.cpp/.o/, <*.cpp>, <modes/*.cpp>' -CMD_TARGS != perl -e 'chdir "$$ENV{SOURCEPATH}/src"; print join " ", grep s/\.cpp/.so/, <commands/*.cpp>' MOD_TARGS != perl -e 'chdir "$$ENV{SOURCEPATH}/src"; print join " ", grep s/\.cpp/.so/, <modules/*.cpp>' MDIR_TARGS != perl -e 'chdir "$$ENV{SOURCEPATH}/src"; print join " ", grep s!/?$$!.so!, grep -d, <modules/m_*>' @@ -8,9 +7,7 @@ CORE_TARGS += socketengines/$(SOCKETENGINE).o threadengines/threadengine_pthread DFILES != perl $(SOURCEPATH)/make/calcdep.pl -all -all: inspircd commands modules - -commands: $(CMD_TARGS) +all: inspircd modules modules: $(MOD_TARGS) $(MDIR_TARGS) diff --git a/make/calcdep.pl b/make/calcdep.pl index 261b6ec18..d8b4e292b 100755 --- a/make/calcdep.pl +++ b/make/calcdep.pl @@ -51,7 +51,7 @@ sub dep_cpp { my($file, $dfile) = @_; gendep $file; my($path,$base) = $file =~ m#^((?:.*/)?)([^/]+)\.cpp# or die "Bad file $file"; - my $ext = $path eq 'modules/' || $path eq 'commands/' ? '.so' : '.o'; + my $ext = $path eq 'modules/' ? '.so' : '.o'; my $out = "$path$base$ext"; $dfile = "$baseout/$path.$base.d" unless defined $dfile; diff --git a/make/gnu-real.mk b/make/gnu-real.mk index 338a5112d..ea9843574 100644 --- a/make/gnu-real.mk +++ b/make/gnu-real.mk @@ -1,7 +1,6 @@ SRC = $(SOURCEPATH)/src VPATH = $(SRC) CORE_TARGS = $(patsubst $(SRC)/%.cpp,%.o,$(wildcard $(SRC)/*.cpp $(SRC)/modes/*.cpp)) -CMD_TARGS = $(patsubst $(SRC)/%.cpp,%.so,$(wildcard $(SRC)/commands/*.cpp)) MOD_TARGS = $(patsubst $(SRC)/%.cpp,%.so,$(wildcard $(SRC)/modules/*.cpp)) CORE_TARGS += socketengines/$(SOCKETENGINE).o threadengines/threadengine_pthread.o @@ -9,15 +8,13 @@ MOD_TARGS += $(shell perl -e 'chdir "$$ENV{SOURCEPATH}/src"; print join " ", gre DFILES = $(shell perl $(SOURCEPATH)/make/calcdep.pl -all) -all: inspircd commands modules - -commands: $(CMD_TARGS) +all: inspircd modules modules: $(MOD_TARGS) inspircd: $(CORE_TARGS) $(RUNCC) -o $@ $(CORELDFLAGS) $(LDLIBS) $^ -.PHONY: all alldep commands modules +.PHONY: all alldep modules -include $(DFILES) |