diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-09-27 22:14:25 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-09-27 22:14:25 +0000 |
| commit | 3900997a0971efc350400f62bfcac8c29aa65885 (patch) | |
| tree | b61d61a609fe3a7b21da6c2a9715171734e703ad | |
| parent | d7ee3683a4d6d76113161be9754c007dee37d288 (diff) | |
Buildsystem updates
Add required compilation flags for interix
Fix build when perl is not in /usr/bin
Clean up unused file masks from .gitignore
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11770 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | .Makefile.inc | 4 | ||||
| -rw-r--r-- | .gitignore | 18 |
2 files changed, 3 insertions, 19 deletions
diff --git a/.Makefile.inc b/.Makefile.inc index 1889d862d..ef1610ab5 100644 --- a/.Makefile.inc +++ b/.Makefile.inc @@ -41,6 +41,8 @@ INSTMODE = 0755 LDLIBS += -ldl SHARED = -bundle -twolevel_namespace -undefined dynamic_lookup CORELDFLAGS = -dynamic -bind_at_load -L. +@ELSIFEQ $(SYSTEM) interix + CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include @ENDIF @IFDEF D @@ -65,7 +67,7 @@ CXXFLAGS += -Iinclude @ELSE @GNU_ONLY MAKEFLAGS += --silent @BSD_ONLY MAKE += -s - RUNCC = $(SOURCEPATH)/make/run-cc.pl $(CC) + RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CC) @ENDIF @DO_EXPORT RUNCC CXXFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS diff --git a/.gitignore b/.gitignore index 16f1fa69a..1d373e98b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,6 @@ *~ *.swp -*.so -*.o -.*.d -*.cpp.* -/*.diff -/*.orig -/*.patch -/*.rej /.config.cache /.modulemanager /BSDmakefile @@ -16,22 +8,17 @@ /bin /build /inspircd -/inspircd.core -/inspircd.pid /modules /org.inspircd.plist /conf/*.conf /conf/*.pem -/conf/inspircd.conf.example /conf/*.pid /include/inspircd_config.h /include/inspircd_version.h /include/inspircd_se_config.h -/src/inspircd - /src/modules/m_geoip.cpp /src/modules/m_ldapauth.cpp /src/modules/m_ldapoper.cpp @@ -46,12 +33,7 @@ /src/modules/m_sqllog.cpp /src/modules/m_sqloper.cpp /src/modules/m_sqlutils.cpp -/src/modules/m_sqlutils.h -/src/modules/m_sqlv2.h /src/modules/m_ssl_gnutls.cpp /src/modules/m_ssl_openssl.cpp -/src/modules/m_ssl_oper_cert.cpp -/src/modules/m_sslinfo.cpp /src/modules/m_testclient.cpp /src/modules/m_ziplink.cpp -/src/modules/ssl_cert.h |