From f4472dd6dcdfbb5d4a2a50ddc615644c3b2c8145 Mon Sep 17 00:00:00 2001 From: danieldg Date: Thu, 3 Sep 2009 02:30:12 +0000 Subject: Change cmd_*.so to use the Module object API Create Module* objects for each command, and load them like modules. This unifies the external API for modules. Library directory is now deprecated: all modules are located in a single module directory. Header files for each command are no longer needed; remove. This also fixes two potential segfaults in m_spanningtree. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11668 e03df62e-2008-0410-955e-edbf42e46eb7 --- .Makefile.inc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to '.Makefile.inc') diff --git a/.Makefile.inc b/.Makefile.inc index 3cc18b60d..f0ea08214 100644 --- a/.Makefile.inc +++ b/.Makefile.inc @@ -20,7 +20,6 @@ CONPATH = "@CONFIG_DIR@" MODPATH = "@MODULE_DIR@" BINPATH = "@BINARY_DIR@" LAUNCHDPATH = "/System/Library/LaunchDaemons" -LIBPATH = "@LIBRARY_DIR@" INSTMODE = 0755 @IFEQ $(CC) icc @@ -66,7 +65,7 @@ CXXFLAGS += -I../include @ENDIF @DO_EXPORT RUNCC CXXFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS -@DO_EXPORT BASE CONPATH MODPATH BINPATH LIBPATH +@DO_EXPORT BASE CONPATH MODPATH BINPATH # Default target TARGET = all @@ -135,11 +134,10 @@ finishmessage: target install: target@EXTRA_DIR@ @-install -d -m $(INSTMODE) $(BASE) - @-install -d -m $(INSTMODE) $(LIBPATH) @-install -d -m $(INSTMODE) $(BINPATH) @-install -d -m $(INSTMODE) $(CONPATH) @-install -d -m $(INSTMODE) $(MODPATH) - -install -m $(INSTMODE) src/commands/*.so $(LIBPATH) + -install -m $(INSTMODE) src/commands/*.so $(MODPATH) -install -m $(INSTMODE) src/modules/*.so $(MODPATH) -install -m $(INSTMODE) @STARTSCRIPT@ $(@DESTINATION@) 2>/dev/null -install -m $(INSTMODE) src/inspircd $(BINPATH) @@ -164,7 +162,6 @@ clean: deinstall: -rm $(BINPATH)/inspircd - -rm $(LIBPATH)/*.so -rm $(MODPATH)/*.so @make/install-extras.pl deinstall -- cgit v1.2.3