summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorramon <ramongomez@us.es>2012-01-16 13:35:43 +0000
committerramon <ramongomez@us.es>2012-01-16 13:35:43 +0000
commitca73ddf4899ba539ea66cd92c1dc9f4f7c7b839b (patch)
tree5895772c5d36bae39f431f318c4bfcb2febda682
parent2bab3a7fefa52133c296760dfb6f1261b8826339 (diff)
VersiĆ³n 1.0.3, #414: linkado correcto en Ubuntu 11.10; ficheros Makefile independientes de distribuciĆ³n.
git-svn-id: https://opengnsys.es/svn/branches/version1.0@2439 a21b9725-9963-47de-94b9-378ad31fedc9
-rw-r--r--Makefile12
1 files changed, 4 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 36da5ec..8f9a613 100644
--- a/Makefile
+++ b/Makefile
@@ -7,17 +7,13 @@ PROYECTO := ogAdmServer
INSTALL_DIR := /opt/opengnsys
# Opciones de compilacion
-CFLAGS := -O0 -g -Wall -I../../Includes # Depuracion
-#CFLAGS := -O3 -Wall # Optimizacion
+CFLAGS := $(shell mysql_config --cflags)
+CFLAGS += -O0 -g -Wall -I../../Includes # Depuracion
+#CFLAGS += -O3 -Wall -I../../Includes # Optimizacion
CPPFLAGS := $(CFLAGS)
# Opciones de linkado
-LBIT := $(shell getconf LONG_BIT)
-ifeq ($(LBIT), 64)
- LDFLAGS := -L/usr/lib64 -L/usr/lib64/mysql -lpthread -lmysqlclient
-else
- LDFLAGS := -L/usr/lib -L/usr/lib/mysql -lpthread -lmysqlclient
-endif
+LDFLAGS := -Wl,--no-as-needed $(shell mysql_config --libs) -lpthread
# Ficheros objetos
OBJS := ../../Includes/Database.o sources/ogAdmServer.o