Skip to content

Commit

Permalink
feat: 0.3.19 add target for .a lib (#59)
Browse files Browse the repository at this point in the history
* feat: add rule to gen .a lib

* chore: fix format

* feat: add README to pack

* fix: run ldconfig on make install
  • Loading branch information
jgabaut authored Dec 22, 2023
1 parent 4c964af commit c2a617e
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 16 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
*.o
# ignore shared object files
*.so
# ignore .a files
*.a
# also explicitly ignore our executable for good measure
demo
# also explicitly ignore our windows executable for good measure
Expand Down
9 changes: 8 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,19 @@ libkoliseo.so: libkoliseo.o
$(CCOMP) $(CFLAGS) $(AM_CFLAGS) -shared $< -o $@
@echo -e "\033[1;33mDone.\e[0m"

libkoliseo.a: libkoliseo.o
@echo -e "\033[1;35m[Makefile]\e[0m Building \"$@\":"
ar rcs $@ $<
@echo -e "\033[1;33mDone.\e[0m"

# Build rule for object files
%.o: %.c
$(CCOMP) -c $(CFLAGS) $(AM_CFLAGS) $< -o $@

install: libkoliseo.so doc
@echo -en "Installing koliseo lib $(VERSION): "
./installer-sh "-i" $(VERSION) $(TARGET_INSTALL_DIR) $(SOURCE_INSTALL_DIR) $(INSTALLER_LOG_FILE)
ldconfig
@echo -e "\n\033[1;33mDone.\e[0m"

uninstall:
Expand Down Expand Up @@ -210,6 +216,7 @@ pack: rebuild
@echo -e "\033[1;32m[TREE] Done.\e[0m"
@echo -e "\033[1;35m[PACK] Installing:\e[0m"
install $(TARGET) ~/koliseo-local/share/$(PACK_NAME)
install README.md ~/koliseo-local/share/$(PACK_NAME)
install ./src/koliseo.c ~/koliseo-local/share/$(PACK_NAME)/src
install ./src/koliseo.h ~/koliseo-local/share/$(PACK_NAME)/src

Expand All @@ -223,7 +230,7 @@ pack: rebuild
@echo -e "\033[1;33mDone.\e[0m"

# Default target (builds everything)
all: $(TARGET) libkoliseo.so
all: $(TARGET) libkoliseo.so libkoliseo.a

# Target to clean and rebuild
rebuild: clean all
Expand Down
1 change: 1 addition & 0 deletions bin/stego.lock
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,4 @@ testsdir = "ok"
"0.3.13" = "Bump amboso to 1.9.7, add invil"
"0.3.17" = "Global lib install, config options, invil 0.1.5"
"0.3.18" = "invil 0.1.6, fixes broken ./anvil -i"
"0.3.19" = "Add .a rule, bump invil"
4 changes: 4 additions & 0 deletions bin/v0.3.19/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#amboso compliant version folder, will ignore everything inside BUT the gitignore, to keep the clean dir
*
!.gitignore
!static
1 change: 1 addition & 0 deletions bin/v0.3.19/static
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Define the package name and version
AC_INIT([koliseo], [0.3.18], [[email protected]])
AC_INIT([koliseo], [0.3.19], [[email protected]])

# Verify automake version and enable foreign option
AM_INIT_AUTOMAKE([foreign -Wall])
Expand Down Expand Up @@ -73,7 +73,7 @@ fi
# Set a default version number if not specified externally
AC_ARG_VAR([VERSION], [Version number])
if test -z "$VERSION"; then
VERSION="0.3.18"
VERSION="0.3.19"
fi

# Output variables to the config.h header
Expand Down
2 changes: 1 addition & 1 deletion docs/koliseo.doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ PROJECT_NAME = "koliseo"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "0.3.18"
PROJECT_NUMBER = "0.3.19"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion invil
18 changes: 9 additions & 9 deletions src/koliseo.c
Original file line number Diff line number Diff line change
Expand Up @@ -2628,21 +2628,21 @@ void kls_temp_end(Koliseo_Temp *tmp_kls)
*/
void kls_dbg_features(void)
{
#ifdef KOLISEO_HAS_CURSES
#ifdef KOLISEO_HAS_CURSES
fprintf(stderr, "[KLS] ncurses.h integration is enabled\n");
#else
#else
fprintf(stderr, "[KLS] ncurses.h integration is not enabled\n");
#endif
#ifdef KOLISEO_HAS_GULP
#endif
#ifdef KOLISEO_HAS_GULP
fprintf(stderr, "[KLS] KLS_GULP is enabled\n");
#else
#else
fprintf(stderr, "[KLS] KLS_GULP is not enabled\n");
#endif
#ifdef KLS_DEBUG_CORE
#endif
#ifdef KLS_DEBUG_CORE
fprintf(stderr, "[KLS] Koliseo core debugging is enabled\n");
#else
#else
fprintf(stderr, "[KLS] Koliseo core debugging is not enabled\n");
#endif
#endif
}

KLS_Region_List kls_emptyList(void)
Expand Down
4 changes: 2 additions & 2 deletions src/koliseo.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

#define KLS_MAJOR 0 /**< Represents current major release.*/
#define KLS_MINOR 3 /**< Represents current minor release.*/
#define KLS_PATCH 18 /**< Represents current patch release.*/
#define KLS_PATCH 19 /**< Represents current patch release.*/

/*! \mainpage Koliseo index page
*
Expand Down Expand Up @@ -183,7 +183,7 @@ static const int KOLISEO_API_VERSION_INT =
/**
* Defines current API version string.
*/
static const char KOLISEO_API_VERSION_STRING[] = "0.3.18"; /**< Represents current version with MAJOR.MINOR.PATCH format.*/
static const char KOLISEO_API_VERSION_STRING[] = "0.3.19"; /**< Represents current version with MAJOR.MINOR.PATCH format.*/

/**
* Returns current koliseo version as a string.
Expand Down

0 comments on commit c2a617e

Please sign in to comment.