From ad2d308436190aeb70cc04a313c228fe9e8f778a Mon Sep 17 00:00:00 2001 From: OpenGnSys Support Team Date: Tue, 26 Nov 2019 18:59:32 +0100 Subject: [PATCH] #967 rename .cpp to .c This actually is C code, use the gcc compiler instead. --- Makefile | 6 +----- sources/{dbi.cpp => dbi.c} | 0 sources/{ogAdmServer.cpp => ogAdmServer.c} | 0 3 files changed, 1 insertion(+), 5 deletions(-) rename sources/{dbi.cpp => dbi.c} (100%) rename sources/{ogAdmServer.cpp => ogAdmServer.c} (100%) diff --git a/Makefile b/Makefile index eafecb3..0c3360e 100644 --- a/Makefile +++ b/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/sources/dbi.cpp b/sources/dbi.c similarity index 100% rename from sources/dbi.cpp rename to sources/dbi.c diff --git a/sources/ogAdmServer.cpp b/sources/ogAdmServer.c similarity index 100% rename from sources/ogAdmServer.cpp rename to sources/ogAdmServer.c