update Makefile

add Makefile for library
update README
2025-05-22 23:05:16 +03:00 · 2025-05-22 23:04:49 +03:00 · 2025-05-22 23:04:24 +03:00 · 2025-05-22 23:01:09 +03:00
7 changed files with 219 additions and 60 deletions
--- a/96
+++ b/96
@ -1,91 +1,86 @@
 CC = gcc
-CFLAGS = -Wall -O2 -Ilibmysyslog
-LDFLAGS = -Lbuild -lmysyslog -lconfig
+PKG_CONFIG = pkg-config
+CONFIG_CFLAGS  := $(shell $(PKG_CONFIG) --cflags libconfig)
+CONFIG_LDFLAGS := $(shell $(PKG_CONFIG) --libs libconfig)
+
+CFLAGS = -Wall -O2 -Ilibmysyslog $(CONFIG_CFLAGS)
+LDFLAGS = -L$(BUILD_DIR) -lmysyslog $(CONFIG_LDFLAGS)

 BUILD_DIR = build

-SRCS_CLIENT = myRPC-client.c
-SRCS_SERVER = myRPC-server.c
+LIB_SRC    = libmysyslog/libmysyslog.c
+LIB_OBJ    = $(BUILD_DIR)/libmysyslog.o
+LIB_A      = $(BUILD_DIR)/libmysyslog.a

-OBJS_CLIENT = $(BUILD_DIR)/myRPC-client.o
-OBJS_SERVER = $(BUILD_DIR)/myRPC-server.o
+CLIENT_DIR   := myRPC-client/src
+CLIENT_SRC   := $(CLIENT_DIR)/myRPC-client.c
+CLIENT_OBJ   := $(BUILD_DIR)/myRPC-client.o
+CLIENT_BIN   := $(BUILD_DIR)/myRPC-client

-TARGET_CLIENT = $(BUILD_DIR)/myRPC-client
-TARGET_SERVER = $(BUILD_DIR)/myRPC-server
+SERVER_DIR   := myRPC-server/src
+SERVER_SRC   := $(SERVER_DIR)/myRPC-server.c
+SERVER_OBJ   := $(BUILD_DIR)/myRPC-server.o
+SERVER_BIN   := $(BUILD_DIR)/myRPC-server

-LIB_SRC = libmysyslog/libmysyslog.c
-LIB_OBJ = $(BUILD_DIR)/libmysyslog.o
-LIB_A = $(BUILD_DIR)/libmysyslog.a
-
-version = 1.0
-revision = 0
+version     = 1.0
+revision    = 0
 architecture = all

-.PHONY: all clean deb repo
+.PHONY: all clean deb repo systemd_install

-all: $(BUILD_DIR) $(LIB_A) $(TARGET_CLIENT) $(TARGET_SERVER)
+all: $(BUILD_DIR) $(LIB_A) $(CLIENT_BIN) $(SERVER_BIN)

 $(BUILD_DIR):
 	mkdir -p $(BUILD_DIR)

-$(BUILD_DIR)/myRPC-client.o: myRPC-client.c | $(BUILD_DIR)
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(BUILD_DIR)/myRPC-server.o: myRPC-server.c | $(BUILD_DIR)
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(BUILD_DIR)/libmysyslog.o: $(LIB_SRC) | $(BUILD_DIR)
+$(LIB_OBJ): $(LIB_SRC) | $(BUILD_DIR)
 	$(CC) $(CFLAGS) -fPIC -c $< -o $@

-$(LIB_A): $(BUILD_DIR)/libmysyslog.o
+$(LIB_A): $(LIB_OBJ)
 	ar rcs $@ $^

-$(TARGET_CLIENT): $(OBJS_CLIENT)
+$(CLIENT_OBJ): $(CLIENT_SRC) | $(BUILD_DIR)
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(CLIENT_BIN): $(CLIENT_OBJ)
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)

-$(TARGET_SERVER): $(OBJS_SERVER)
+$(SERVER_OBJ): $(SERVER_SRC) | $(BUILD_DIR)
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(SERVER_BIN): $(SERVER_OBJ)
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)

 ###############################################################################
 # Создание deb-пакетов
 ###############################################################################

-# Цель deb собирает deb-пакеты для клиента и сервера, а затем очищает временные директории
 deb: deb_client deb_server
 	@rm -rf MyRPC_client_$(version)-$(revision)_$(architecture)
 	@rm -rf MyRPC_server_$(version)-$(revision)_$(architecture)

-# Создание deb-пакета для myRPC-client
 deb_client:
 	@mkdir -p MyRPC_client_$(version)-$(revision)_$(architecture)/DEBIAN
-	@echo "Package: myrpc-client"                           > MyRPC_client_$(version)-$(revision)_$(architecture)/DEBIAN/control
-	@echo "Version: $(version)"                             >> MyRPC_client_$(version)-$(revision)_$(architecture)/DEBIAN/control
-	@echo "Architecture: $(architecture)"                   >> MyRPC_client_$(version)-$(revision)_$(architecture)/DEBIAN/control
-	@echo "Maintainer: gandc <admin@gandc.ru>"  >> MyRPC_client_$(version)-$(revision)_$(architecture)/DEBIAN/control
-	@echo "Description: Client for remote command execution via myRPC" >> MyRPC_client_$(version)-$(revision)_$(architecture)/DEBIAN/control
+	@printf "Package: myrpc-client\nVersion: $(version)\nArchitecture: $(architecture)\nMaintainer: gandc <admin@gandc.ru>\nDescription: Client for remote command execution via myRPC\n" > MyRPC_client_$(version)-$(revision)_$(architecture)/DEBIAN/control
 	@mkdir -p MyRPC_client_$(version)-$(revision)_$(architecture)/usr/local/bin
-	@cp $(TARGET_CLIENT) MyRPC_client_$(version)-$(revision)_$(architecture)/usr/local/bin
+	@cp $(CLIENT_BIN) MyRPC_client_$(version)-$(revision)_$(architecture)/usr/local/bin
 	@dpkg-deb --root-owner-group --build MyRPC_client_$(version)-$(revision)_$(architecture)

-# Создание deb-пакета для myRPC-server
 deb_server:
 	@mkdir -p MyRPC_server_$(version)-$(revision)_$(architecture)/DEBIAN
-	@echo "Package: myrpc-server"                           > MyRPC_server_$(version)-$(revision)_$(architecture)/DEBIAN/control
-	@echo "Version: $(version)"                             >> MyRPC_server_$(version)-$(revision)_$(architecture)/DEBIAN/control
-	@echo "Architecture: $(architecture)"                   >> MyRPC_server_$(version)-$(revision)_$(architecture)/DEBIAN/control
-	@echo "Maintainer: gandc <admin@gandc.ru>"  >> MyRPC_server_$(version)-$(revision)_$(architecture)/DEBIAN/control
-	@echo "Description: Server for remote command execution via myRPC" >> MyRPC_server_$(version)-$(revision)_$(architecture)/DEBIAN/control
+	@printf "Package: myrpc-server\nVersion: $(version)\nArchitecture: $(architecture)\nMaintainer: gandc <admin@gandc.ru>\nDescription: Server for remote command execution via myRPC\n" > MyRPC_server_$(version)-$(revision)_$(architecture)/DEBIAN/control
 	@mkdir -p MyRPC_server_$(version)-$(revision)_$(architecture)/usr/local/bin
-	@cp $(TARGET_SERVER) MyRPC_server_$(version)-$(revision)_$(architecture)/usr/local/bin
+	@cp $(SERVER_BIN) MyRPC_server_$(version)-$(revision)_$(architecture)/usr/local/bin
+	@mkdir -p MyRPC_server_$(version)-$(revision)_$(architecture)/lib/systemd/system
 	@cp systemd/myrpc-server.service MyRPC_server_$(version)-$(revision)_$(architecture)/lib/systemd/system
-	@echo "#!/bin/sh"        > MyRPC_server_$(version)-$(revision)_$(architecture)/DEBIAN/postinst
-	@echo "systemctl daemon-reload" >> MyRPC_server_$(version)-$(revision)_$(architecture)/DEBIAN/postinst
+	@printf "#!/bin/sh\nsystemctl daemon-reload\n" > MyRPC_server_$(version)-$(revision)_$(architecture)/DEBIAN/postinst
 	@chmod 755 MyRPC_server_$(version)-$(revision)_$(architecture)/DEBIAN/postinst
 	@dpkg-deb --root-owner-group --build MyRPC_server_$(version)-$(revision)_$(architecture)

 ###############################################################################
 # Создание локального репозитория APT
 ###############################################################################
+
 repo:
 	@mkdir -p /usr/local/repos
 	@cp *.deb /usr/local/repos
@ -93,17 +88,20 @@ repo:
 	@echo "deb [trusted=yes] file:/usr/local/repos ./" | sudo tee /etc/apt/sources.list.d/myrpc.list
 	@sudo apt-get update

+###############################################################################
+# Установка systemd unit-файла
+###############################################################################
+
 systemd_install:
-	@echo "Installing systemd unit"
+	@echo "Installing systemd unit for myrpc-server..."
 	@sudo cp systemd/myrpc-server.service /etc/systemd/system/
 	@sudo systemctl daemon-reload
-#	@sudo systemctl enable myrpc-server
-#	@sudo systemctl restart myrpc-server
-	@echo "Systemd unit successfully installed"
+	@echo "Done. You can now sudo systemctl enable myrpc-server && sudo systemctl start myrpc-server"

 ###############################################################################
-# Очистка временных файлов
+# Очистка
 ###############################################################################
+
 clean:
 	rm -rf $(BUILD_DIR)
-	rm -f *.deb
+	rm -f *.deb
--- a/README.md
+++ b/README.md
@ -7,14 +7,21 @@
 ## Структура проекта

 ```
-myrpc/
+myRPC/
 ├── libmysyslog/
+│   ├── Makefile
 │   ├── libmysyslog.c
 │   └── libmysyslog.h
 ├── systemd/
 │   └── myrpc-server.service
-├── myRPC-client.c
-├── myRPC-server.c
+├── myRPC-client/
+│   ├── Makefile
+│   └── src/
+│   	└── myRPC-client.c
+├── myRPC-server
+│   ├── Makefile
+│   └── src/
+│   	└── myRPC-server.c
 └── Makefile
 ```

@ -43,17 +50,21 @@ make all

 Создайте конфигурационный файл `/etc/myRPC/myRPC.conf` со следующим содержимым:

-```
-port = 1234;
-socket_type = "stream";
-```
+   ```conf
+   # Порт, на котором будет слушать сервер
+   port = 1234
+   # Тип сокета : stream(TCP) или dgram(UDP)
+   socket_type = stream
+   ```

 Создайте файл со списком разрешенных пользователей `/etc/myRPC/users.conf`:

-```
-username1
-username2
-```
+   ```conf
+   # Список разрешённых пользователей
+   username1
+   username2
+   username3
+   ```

 Запустите сервер:

--- a/libmysyslog/Makefile
+++ b/libmysyslog/Makefile
@ -0,0 +1,38 @@
+CC = gcc
+CFLAGS = -Wall -O2 -fPIC
+
+SRC = libmysyslog.c
+OBJ = libmysyslog.o
+STATIC = libmysyslog.a
+SHARED = libmysyslog.so
+
+version     = 1.0
+revision    = 0
+architecture = all
+
+.PHONY: all clean deb
+
+all: $(STATIC) $(SHARED)
+
+$(OBJ): $(SRC)
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(STATIC): $(OBJ)
+	ar rcs $@ $^
+
+$(SHARED): $(OBJ)
+	$(CC) -shared -o $@ $^
+
+deb:
+	mkdir -p MySyslog_library_$(version)-$(revision)_$(architecture)/DEBIAN
+	printf "Package: libmysyslog\nVersion: $(version)\nArchitecture: $(architecture)\nMaintainer: gandc <admin@gandc.ru>\nDescription: Core library for mysyslog logging\n" \
+		> MySyslog_library_$(version)-$(revision)_$(architecture)/DEBIAN/control
+	mkdir -p MySyslog_library_$(version)-$(revision)_$(architecture)/usr/local/lib
+	mkdir -p MySyslog_library_$(version)-$(revision)_$(architecture)/usr/local/include
+	cp $(STATIC) MySyslog_library_$(version)-$(revision)_$(architecture)/usr/local/lib
+	cp libmysyslog.h MySyslog_library_$(version)-$(revision)_$(architecture)/usr/local/include
+	dpkg-deb --root-owner-group --build MySyslog_library_$(version)-$(revision)_$(architecture)
+
+clean:
+	rm -f $(OBJ) $(STATIC) $(SHARED)
+	rm -rf MySyslog_library_$(version)-$(revision)_$(architecture)
--- a/myRPC-client/Makefile
+++ b/myRPC-client/Makefile
@ -0,0 +1,38 @@
+CC := gcc  
+LIBDIR := ../libmysyslog  
+CFLAGS := -Wall -O2 -I$(LIBDIR)  
+LDFLAGS := -L$(LIBDIR) -lmysyslog  
+
+SRC := src/myRPC-client.c  
+OBJ := myRPC-client.o  
+BIN := myRPC-client  
+
+version     := 1.0  
+revision    := 0  
+architecture := all  
+
+.PHONY: all clean deb  
+
+all: $(LIBDIR)/libmysyslog.so $(BIN)  
+
+$(LIBDIR)/libmysyslog.so:  
+	$(MAKE) -C $(LIBDIR)  
+
+$(OBJ): $(SRC)  
+	$(CC) $(CFLAGS) -c $< -o $@  
+
+$(BIN): $(OBJ)  
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)  
+
+deb: deb_client  
+	@rm -rf MyRPC_client_$(version)-$(revision)_$(architecture)  
+
+deb_client:  
+	mkdir -p MyRPC_client_$(version)-$(revision)_$(architecture)/DEBIAN  
+	printf "Package: myrpc-client\nVersion: $(version)\nArchitecture: $(architecture)\nMaintainer: gandc <admin@gandc.ru>\nDescription: Client for remote command execution via myRPC\n" > MyRPC_client_$(version)-$(revision)_$(architecture)/DEBIAN/control  
+	mkdir -p MyRPC_client_$(version)-$(revision)_$(architecture)/usr/local/bin  
+	cp $(BIN) MyRPC_client_$(version)-$(revision)_$(architecture)/usr/local/bin  
+	dpkg-deb --root-owner-group --build MyRPC_client_$(version)-$(revision)_$(architecture)  
+
+clean:  
+	rm -f $(OBJ) $(BIN)  
--- a/myRPC-client/src/myRPC-client.c
+++ b/myRPC-client/src/myRPC-client.c
--- a/myRPC-server/Makefile
+++ b/myRPC-server/Makefile
@ -0,0 +1,74 @@
+CC := gcc
+PKG_CONFIG := pkg-config
+
+# Pull in libconfig flags
+CONFIG_CFLAGS  := $(shell $(PKG_CONFIG) --cflags libconfig)
+CONFIG_LDFLAGS := $(shell $(PKG_CONFIG) --libs libconfig)
+
+# Path to the shared logging library
+LIBDIR := ../libmysyslog
+
+CFLAGS := -Wall -O2 -I$(LIBDIR) $(CONFIG_CFLAGS)
+LDFLAGS := -L$(LIBDIR) -lmysyslog $(CONFIG_LDFLAGS)
+
+SRC := src/myRPC-server.c
+OBJ := myRPC-server.o
+BIN := myRPC-server
+
+version     := 1.0
+revision    := 0
+architecture := all
+
+.PHONY: all clean deb systemd_install
+
+all: $(LIBDIR)/libmysyslog.a $(BIN)
+
+$(LIBDIR)/libmysyslog.a:
+	$(MAKE) -C $(LIBDIR)
+
+# Compile server
+$(OBJ): $(SRC)
+	$(CC) $(CFLAGS) -c $< -o $@
+
+# Link server
+$(BIN): $(OBJ)
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+
+###############################################################################
+# deb
+###############################################################################
+
+deb: deb_server
+	@rm -rf MyRPC_server_$(version)-$(revision)_$(architecture)
+
+deb_server:
+	mkdir -p MyRPC_server_$(version)-$(revision)_$(architecture)/DEBIAN
+	printf "Package: myrpc-server\nVersion: $(version)\nArchitecture: $(architecture)\nMaintainer: gandc <admin@gandc.ru>\nDescription: Server for remote command execution via myRPC\n" \
+		> MyRPC_server_$(version)-$(revision)_$(architecture)/DEBIAN/control
+
+	mkdir -p MyRPC_server_$(version)-$(revision)_$(architecture)/usr/local/bin
+	cp $(BIN) MyRPC_server_$(version)-$(revision)_$(architecture)/usr/local/bin
+
+	mkdir -p MyRPC_server_$(version)-$(revision)_$(architecture)/lib/systemd/system
+	cp ../systemd/myrpc-server.service MyRPC_server_$(version)-$(revision)_$(architecture)/lib/systemd/system
+
+	printf "#!/bin/sh\nsystemctl daemon-reload\n" \
+		> MyRPC_server_$(version)-$(revision)_$(architecture)/DEBIAN/postinst
+	chmod 755 MyRPC_server_$(version)-$(revision)_$(architecture)/DEBIAN/postinst
+
+	dpkg-deb --root-owner-group --build MyRPC_server_$(version)-$(revision)_$(architecture)
+
+###############################################################################
+# Copy unit and reload systemd
+###############################################################################
+
+systemd_install:
+	sudo cp ../systemd/myrpc-server.service /etc/systemd/system/
+	sudo systemctl daemon-reload
+
+###############################################################################
+# Cleanup
+###############################################################################
+
+clean:
+	rm -f $(OBJ) $(BIN)
--- a/myRPC-server/src/myRPC-server.c
+++ b/myRPC-server/src/myRPC-server.c
Author	SHA1	Message	Date
gandc	88a435608d	update Makefile	2025-05-22 23:05:16 +03:00
gandc	581d467da3	add Makefile for library	2025-05-22 23:04:49 +03:00
gandc	00909cc0a8	update README	2025-05-22 23:04:24 +03:00
gandc	b09667de3e	change project structure	2025-05-22 23:01:09 +03:00