diff options
| author | Pixel <pixel@nobis-crew.org> | 2009-05-18 08:57:55 -0700 |
|---|---|---|
| committer | Pixel <pixel@nobis-crew.org> | 2009-05-18 08:57:55 -0700 |
| commit | 9cc4ddee95f82ffdf4d0eb0a92117a3b6361a928 (patch) | |
| tree | dea4e1898b52bdefa378c8cb497a4158b07ada65 | |
| parent | b18946972e3f88b38896a197b948bd13a2de0414 (diff) | |
| parent | 8355fcc5e6ecfc106ade0f4fdeaa97db9fa22f43 (diff) | |
Merge branch 'master' of ssh+git://pixel@git.grumpycoder.net/pub/repo.git/lua-modules
| -rw-r--r-- | Makefile | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -19,8 +19,11 @@ CC = gcc CXX = g++ STRIP = strip +HAS_ORACLE=$(shell [ -d /usr/local/instantclient ] && echo true || echo false ]) + INCLUDES = \ --I ../Mesa-7.2/include \ +-I../Mesa-7.4.2/include \ +-I/usr/include/ImageMagick \ -I../mogltk/include \ -I../Baltisot/include \ -I../Baltisot/lib/zlib/include \ @@ -131,7 +134,6 @@ plugin-luarand.cc \ WHOLE_SOURCES = \ $(CONFIGFILES_SOURCES) \ $(XML_SOURCES) \ -$(OCCI_SOURCES) \ $(HANDLE_SOURCES) \ $(HTTP_SOURCES) \ $(REGEX_SOURCES) \ @@ -143,10 +145,13 @@ $(FTGL_SOURCES) \ $(OSMESA_SOURCES) \ $(RAND_SOURCES) \ +ifeq ($(HAVE_ORACLE),true) +WHOLE_SOURCES += $(OCCI_SOURCES) +endif + MODULES_LIST = \ luaconfigfiles.$(SHARED_EXT) \ luaxml.$(SHARED_EXT) \ -luaocci.$(SHARED_EXT) \ luahandle.$(SHARED_EXT) \ luahttp.$(SHARED_EXT) \ luaregex.$(SHARED_EXT) \ @@ -158,6 +163,10 @@ lualibs.$(SHARED_EXT) \ luaosmesa.$(SHARED_EXT) \ luarand.$(SHARED_EXT) \ +ifeq ($(HAVE_ORACLE),true) +MODULES_LIST += luaocci.$(SHARED_EXT) +endif + ALL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(WHOLE_SOURCES) $(LUA_LIB)))) ALL_DEPS = $(addsuffix .dep, $(notdir $(basename $(WHOLE_SOURCES)))) |