Versión 1.0.2a, #479, #414: linkado correcto en Ubuntu 11.10; ficheros Makefile independientes de distribución.

git-svn-id: https://opengnsys.es/svn/trunk@2442 a21b9725-9963-47de-94b9-378ad31fedc9

4 files changed, 17 insertions, 33 deletions

diff --git a/admin/Sources/Services/ogAdmAgent/Makefile b/admin/Sources/Services/ogAdmAgent/Makefile
index 6a7a180a..0d6d5ebc 100644
--- a/admin/Sources/Services/ogAdmAgent/Makefile
+++ b/admin/Sources/Services/ogAdmAgent/Makefile
@@ -7,17 +7,13 @@ PROYECTO := ogAdmAgent
 INSTALL_DIR := /opt/opengnsys
 
 # Opciones de compilacion
-#CFLAGS := -O0 -g -Wall -I../../Includes	# Depuracion
-CFLAGS := -O3 -Wall -I../../Includes		# Depuracion
+CFLAGS := $(shell mysql_config --cflags)
+#CFLAGS += -O0 -g -Wall -I../../Includes	# Depuracion
+CFLAGS += -O3 -Wall			# 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/ogAdmAgent.o 
diff --git a/admin/Sources/Services/ogAdmBoot/Makefile b/admin/Sources/Services/ogAdmBoot/Makefile
index a8d9da0e..a3a0e166 100644
--- a/admin/Sources/Services/ogAdmBoot/Makefile
+++ b/admin/Sources/Services/ogAdmBoot/Makefile
@@ -7,17 +7,13 @@ PROYECTO := ogAdmBoot
 INSTALL_DIR := /opt/opengnsys
 
 # Opciones de compilacion
-#CFLAGS := -O0 -g -Wall -I../includes	# Depuracion
-CFLAGS := -O3 -Wall -I../includes	# Depuracion
+CFLAGS := $(shell mysql_config --cflags)
+#CFLAGS += -O0 -g -Wall -I../../Includes	# Depuracion
+CFLAGS += -O3 -Wall			# 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/ogAdmBoot.o 
@@ -27,7 +23,7 @@ all: $(PROYECTO)
 
 $(PROYECTO): $(OBJS)
 	g++ $(LDFLAGS) $(OBJS) -o $(PROYECTO)
-	strip $(PROYECTO)		# Optimizacion
+#	strip $(PROYECTO)		# Optimizacion
 
 install: $(PROYECTO)
 	cp $(PROYECTO) $(INSTALL_DIR)/sbin
diff --git a/admin/Sources/Services/ogAdmRepo/Makefile b/admin/Sources/Services/ogAdmRepo/Makefile
index b7b9a592..7c273680 100644
--- a/admin/Sources/Services/ogAdmRepo/Makefile
+++ b/admin/Sources/Services/ogAdmRepo/Makefile
@@ -7,17 +7,13 @@ PROYECTO := ogAdmRepo
 INSTALL_DIR := /opt/opengnsys
 
 # Opciones de compilacion
-#CFLAGS := -O0 -g -Wall -I../../Includes	# Depuracion
-CFLAGS := -O3 -Wall -I../../Includes		# Depuracion
+CFLAGS := $(shell mysql_config --cflags)
+#CFLAGS += -O0 -g -Wall -I../../Includes	# Depuracion
+CFLAGS += -O3 -Wall			# 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/ogAdmRepo.o 
diff --git a/admin/Sources/Services/ogAdmServer/Makefile b/admin/Sources/Services/ogAdmServer/Makefile
index d2312ddf..2225358c 100644
--- a/admin/Sources/Services/ogAdmServer/Makefile
+++ b/admin/Sources/Services/ogAdmServer/Makefile
@@ -7,17 +7,13 @@ PROYECTO := ogAdmServer
 INSTALL_DIR := /opt/opengnsys
 
 # Opciones de compilacion
-#CFLAGS := -O0 -g -Wall -I../../Includes	# Depuracion
-CFLAGS := -O3 -Wall -I../../Includes		# Depuracion
+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