Merge pull request #27 from MightyCreak/master

Improve the Makefiles
This commit is contained in:
guinux 2015-01-26 13:08:29 +01:00
commit b8f93bc0a5
5 changed files with 24 additions and 14 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ data/polkit/org.manjaro.pamac.policy
po/*.mo po/*.mo
po/*~ po/*~
po/locale po/locale
*.swp

View File

@ -1,14 +1,13 @@
all: all:
cd resources; make resources cd resources && make resources
cd src; make binaries cd src && make binaries
cd po; make gettext cd po && make gettext
clean: clean:
rm -f src/*.c src/pamac-refresh src/pamac-daemon src/pamac-tray src/pamac-updater src/pamac-manager src/pamac-install cd resources && make clean
rm -f resources/*.c cd src && make clean
rm -rf po/locale cd po && make clean
rm -f po/*.mo
rm -f data/polkit/org.manjaro.pamac.policy rm -f data/polkit/org.manjaro.pamac.policy
install: install:

View File

@ -3,10 +3,14 @@ MSGLANGS=$(notdir $(wildcard *.po))
MSGOBJS=$(addprefix locale/,$(MSGLANGS:.po=/LC_MESSAGES/pamac.mo)) MSGOBJS=$(addprefix locale/,$(MSGLANGS:.po=/LC_MESSAGES/pamac.mo))
gettext: $(MSGOBJS)
itstool -j ../data/polkit/org.manjaro.pamac.policy.in -o ../data/polkit/org.manjaro.pamac.policy $(MSGLANGS:.po=.mo)
clean:
rm -rf locale
rm -f *.mo
locale/%/LC_MESSAGES/pamac.mo: %.po locale/%/LC_MESSAGES/pamac.mo: %.po
msgfmt -c -o $*.mo $*.po msgfmt -c -o $*.mo $*.po
mkdir -p $(dir $@) mkdir -p $(dir $@)
cp $*.mo $(dir $@)pamac.mo cp $*.mo $(dir $@)pamac.mo
gettext: $(MSGOBJS)
itstool -j ../data/polkit/org.manjaro.pamac.policy.in -o ../data/polkit/org.manjaro.pamac.policy $(MSGLANGS:.po=.mo)

View File

@ -33,6 +33,11 @@ INSTALLER_RESOURCES_FILES = progress_dialog.ui \
transaction_sum_dialog.ui \ transaction_sum_dialog.ui \
transaction_info_dialog.ui transaction_info_dialog.ui
resources: manager_resources.c updater_resources.c installer_resources.c
clean:
rm -f *.c
manager_resources.c: $(MANAGER_GRESOURCE_FILE) $(MANAGER_RESOURCES_FILES) manager_resources.c: $(MANAGER_GRESOURCE_FILE) $(MANAGER_RESOURCES_FILES)
glib-compile-resources $(MANAGER_GRESOURCE_FILE) --target=manager_resources.c --generate-source glib-compile-resources $(MANAGER_GRESOURCE_FILE) --target=manager_resources.c --generate-source
@ -41,5 +46,3 @@ updater_resources.c: $(UPDATER_GRESOURCE_FILE) $(UPDATER_RESOURCES_FILES)
installer_resources.c: $(INSTALLER_GRESOURCE_FILE) $(INSTALLER_RESOURCES_FILES) installer_resources.c: $(INSTALLER_GRESOURCE_FILE) $(INSTALLER_RESOURCES_FILES)
glib-compile-resources $(INSTALLER_GRESOURCE_FILE) --target=installer_resources.c --generate-source glib-compile-resources $(INSTALLER_GRESOURCE_FILE) --target=installer_resources.c --generate-source
resources: manager_resources.c updater_resources.c installer_resources.c

View File

@ -29,6 +29,11 @@ DIALOGS_FILES = choose_provider_dialog.vala \
preferences_dialog.vala \ preferences_dialog.vala \
progress_dialog.vala progress_dialog.vala
binaries: pamac-refresh pamac-daemon pamac-tray pamac-updater pamac-manager pamac-install
clean:
rm -f *.c pamac-refresh pamac-daemon pamac-tray pamac-updater pamac-manager pamac-install
pamac-refresh: refresh.vala pamac-refresh: refresh.vala
valac -o pamac-refresh \ valac -o pamac-refresh \
--pkg=gio-2.0 \ --pkg=gio-2.0 \
@ -100,5 +105,3 @@ pamac-install: ../vapi/libalpm.vapi $(COMMON_SOURCES) $(DIALOGS_FILES) ../resour
mirrors_config.vala \ mirrors_config.vala \
transaction.vala \ transaction.vala \
installer.vala installer.vala
binaries: pamac-refresh pamac-daemon pamac-tray pamac-updater pamac-manager pamac-install