diff --git a/Makefile b/Makefile
index 83014ea..dcee116 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,6 @@ CMAKE_UI_BUILD_DIR = $(MAKEFILE_PATH)compile
DEPENDS = /bin/cmake
PREFIX ?= /usr/local
PKGNAME = $(MAKEFILE_DIR)
-PRJNAME = $(subst lib,,${PKGNAME})
FILE_VER = source/CMakeLists.txt
PKGIDENT=$(subst /,-,${PREFIX})
@@ -33,7 +32,7 @@ init:
else \
LATEST_TAG="Development"; \
fi; \
- sed -r "s/^(project\(${PRJNAME} VERSION ).*/\1$${LATEST_TAG}\)/" -i ${FILE_VER}; \
+ sed -r "s/^(project\(${PKGNAME} VERSION ).*/\1$${LATEST_TAG}\)/" -i ${FILE_VER}; \
echo "-- Build path: ${CMAKE_UI_BUILD_DIR}"
depend:
@@ -86,8 +85,8 @@ uninstall:
$(RM) "$${PATH_FILE_MO}"; \
done
@for SIZE in 16x16 32x32 48x48 scalable; do \
- $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PRJNAME}.svg"; \
- $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PRJNAME}.png"; \
+ $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
+ $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \
done
@for FILE_SVG in $(wildcard *.svg); do \
for SIZE in 16x16 32x32 48x48 scalable; do \
@@ -117,11 +116,11 @@ install: check
done
@for SIZE in 16 32 48; do \
install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
- rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PRJNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PRJNAME}.svg"; \
+ rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
done
- @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PRJNAME}.svg"
- @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PRJNAME}.checked.svg"
- @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PRJNAME}.warning.svg"
+ @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
+ @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
+ @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
@if [ -z ${DESTDIR} ]; then \
[ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
update-desktop-database --quiet &>/dev/null || true; \
diff --git a/com.ublinux.ublsettingsui-gtk3.checked.svg b/com.ublinux.libublsettingsui-gtk3.checked.svg
similarity index 100%
rename from com.ublinux.ublsettingsui-gtk3.checked.svg
rename to com.ublinux.libublsettingsui-gtk3.checked.svg
diff --git a/com.ublinux.ublsettingsui-gtk3.svg b/com.ublinux.libublsettingsui-gtk3.svg
similarity index 100%
rename from com.ublinux.ublsettingsui-gtk3.svg
rename to com.ublinux.libublsettingsui-gtk3.svg
diff --git a/com.ublinux.ublsettingsui-gtk3.warning.svg b/com.ublinux.libublsettingsui-gtk3.warning.svg
similarity index 100%
rename from com.ublinux.ublsettingsui-gtk3.warning.svg
rename to com.ublinux.libublsettingsui-gtk3.warning.svg
diff --git a/gresource.xml b/gresource.xml
index 0fcb609..b9eb643 100644
--- a/gresource.xml
+++ b/gresource.xml
@@ -1,17 +1,17 @@
- ublsettingsui-gtk3.glade
- ublsettingsui-gtk3-about.glade
- ublsettingsui-gtk3-documentation.glade
- ublsettingsui-gtk3-saving.glade
+ libublsettingsui-gtk3.glade
+ libublsettingsui-gtk3-about.glade
+ libublsettingsui-gtk3-documentation.glade
+ libublsettingsui-gtk3-saving.glade
- ublsettingsui-gtk3.css
+ libublsettingsui-gtk3.css
- ublsettingsui-gtk3-banner.png
- com.ublinux.ublsettingsui-gtk3.checked.svg
- com.ublinux.ublsettingsui-gtk3.warning.svg
+ libublsettingsui-gtk3-banner.png
+ com.ublinux.libublsettingsui-gtk3.checked.svg
+ com.ublinux.libublsettingsui-gtk3.warning.svg
\ No newline at end of file
diff --git a/ublsettingsui-gtk3-about.glade b/libublsettingsui-gtk3-about.glade
similarity index 90%
rename from ublsettingsui-gtk3-about.glade
rename to libublsettingsui-gtk3-about.glade
index 0dae3ac..d7bf64d 100644
--- a/ublsettingsui-gtk3-about.glade
+++ b/libublsettingsui-gtk3-about.glade
@@ -1,26 +1,26 @@
-
+