summaryrefslogtreecommitdiffstats
path: root/admin/Sources
diff options
context:
space:
mode:
authorOpenGnSys Support Team <soporte-og@soleta.eu>2019-11-26 18:59:32 +0100
committerOpenGnSys Support Team <soporte-og@soleta.eu>2020-03-05 23:45:48 +0100
commitab71ca861917c851cab23e5527dc7baca968e273 (patch)
tree737ef72c4658db67a1b942c5f5d70dbbcc3e1adc /admin/Sources
parent8aa0c08b30c7630cb43252d00d8e8b3193a5258e (diff)
#967 rename .cpp to .c
This actually is C code, use the gcc compiler instead.
Diffstat (limited to 'admin/Sources')
-rw-r--r--admin/Sources/Services/ogAdmServer/Makefile6
-rw-r--r--admin/Sources/Services/ogAdmServer/sources/dbi.c (renamed from admin/Sources/Services/ogAdmServer/sources/dbi.cpp)0
-rw-r--r--admin/Sources/Services/ogAdmServer/sources/ogAdmServer.c (renamed from admin/Sources/Services/ogAdmServer/sources/ogAdmServer.cpp)0
3 files changed, 1 insertions, 5 deletions
diff --git a/admin/Sources/Services/ogAdmServer/Makefile b/admin/Sources/Services/ogAdmServer/Makefile
index eafecb33..0c3360e6 100644
--- a/admin/Sources/Services/ogAdmServer/Makefile
+++ b/admin/Sources/Services/ogAdmServer/Makefile
@@ -9,7 +9,6 @@ INSTALL_DIR := /opt/opengnsys
# Opciones de compilacion
CFLAGS := $(shell mysql_config --cflags)
CFLAGS += -g -Wall -I../../Includes
-CPPFLAGS := $(CFLAGS)
# Opciones de linkado
LDFLAGS := -Wl,--no-as-needed $(shell mysql_config --libs) -lev -ljansson -ldbi
@@ -21,7 +20,7 @@ OBJS := sources/ogAdmServer.o sources/dbi.o
all: $(PROYECTO)
$(PROYECTO): $(OBJS)
- g++ $(LDFLAGS) $(OBJS) -o $(PROYECTO)
+ gcc $(LDFLAGS) $(CFLAGS) $(OBJS) -o $(PROYECTO)
install: $(PROYECTO)
cp $(PROYECTO) $(INSTALL_DIR)/sbin
@@ -33,9 +32,6 @@ clean:
uninstall: clean
rm -f /usr/local/sbin/$(PROYECTO) /usr/local/etc/$(PROYECTO).cfg
-sources/%.o: sources/%.cpp
- g++ $(CPPFLAGS) -c -o"$@" "$<"
-
sources/%.o: sources/%.c
gcc $(CFLAGS) -c -o"$@" "$<"
diff --git a/admin/Sources/Services/ogAdmServer/sources/dbi.cpp b/admin/Sources/Services/ogAdmServer/sources/dbi.c
index cc5c5b59..cc5c5b59 100644
--- a/admin/Sources/Services/ogAdmServer/sources/dbi.cpp
+++ b/admin/Sources/Services/ogAdmServer/sources/dbi.c
diff --git a/admin/Sources/Services/ogAdmServer/sources/ogAdmServer.cpp b/admin/Sources/Services/ogAdmServer/sources/ogAdmServer.c
index 562a39de..562a39de 100644
--- a/admin/Sources/Services/ogAdmServer/sources/ogAdmServer.cpp
+++ b/admin/Sources/Services/ogAdmServer/sources/ogAdmServer.c