Skip to content

Commit

Permalink
Fixes failed builds
Browse files Browse the repository at this point in the history
  • Loading branch information
eloaders committed Feb 9, 2014
1 parent b2316fa commit 4710c07
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 24 deletions.
42 changes: 22 additions & 20 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
#!/usr/bin/make -f

include i-nex.mk

make: build-inex build-json build-pixmaps

install: install-create-dirs install-pastebinit-and-other \
install-pixmaps install-changelogs install-manpages \
install-docs install-json install-inex install-scripts

clean: clean-pixmaps clean-json clean-inex clean-all

distclean: clean

sysclean: uninstall rmgambas

build-inex:
@echo -e '\033[1;32mBuild I-Nex...\033[0m'
$(MAKE) -C src
Expand All @@ -14,10 +23,6 @@ build-pixmaps:
@echo -e '\033[1;32mBuild Pixmaps...\033[0m'
$(MAKE) -C pixmaps

install: install-create-dirs install-pastebinit-and-other \
install-pixmaps install-changelogs install-manpages \
install-docs install-json install-inex install-scripts \

install-create-dirs:
mkdir -p $(DESTDIR)$(bindir)
mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps/
Expand All @@ -31,7 +36,6 @@ install-pastebinit-and-other:
$(INSTALL) 0755 pastebin.d/* $(DESTDIR)$(PREFIX)/share/i-nex/pastebinit/pastebin.d/
$(INSTALL) 0755 pastebinit $(DESTDIR)$(PREFIX)/share/i-nex/pastebinit/
$(INSTALL) 0755 pastebinit.xml $(DESTDIR)$(PREFIX)/share/i-nex/pastebinit/
$(INSTALL) 0755 README $(DESTDIR)$(PREFIX)/share/i-nex/pastebinit/
$(INSTALL) 0755 release.conf $(DESTDIR)$(PREFIX)/share/i-nex/pastebinit/

install-pixmaps:
Expand Down Expand Up @@ -61,9 +65,17 @@ install-inex:
install-scripts:
@echo -e '\033[1;32mInstall Scripts...\033[0m'
$(MAKE) -C Scripts install

distclean: clean
clean: clean-pixmaps clean-json clean-inex

clean-pixmaps:
$(MAKE) -C pixmaps clean

clean-json:
$(MAKE) -C JSON clean

clean-inex:
if test -f "src/Makefile" ; then $(MAKE) -C src distclean ; fi

clean-all:
$(RM_COM) $(RMDIR_OPT) `find . -name ".gambas"`
$(RM_COM) $(RMDIR_OPT) `find . -name "*.gambas"`
$(RM_COM) $(RMDIR_OPT) `find . -name ".directory"`
Expand All @@ -79,16 +91,6 @@ clean: clean-pixmaps clean-json clean-inex
$(RM_COM) $(RMDIR_OPT) debian/i-nex.substvars
$(RM_COM) $(RMDIR_OPT) debian/changelog1

clean-pixmaps:
$(MAKE) -C pixmaps clean

clean-json:
$(MAKE) -C JSON clean

clean-inex:
if test -f "src/Makefile" ; then $(MAKE) -C src distclean ; fi

sysclean: uninstall rmgambas
uninstall:
rm $(DESTDIR)$(bindir)/i-nex
rm $(DESTDIR)$(bindir)/i-nex-edid
Expand Down Expand Up @@ -121,4 +123,4 @@ rmgambas:
$(RM_COM) $(RMFILE_OPT) $(PREFIX)/lib/gambas3/gb.gui.opengl.so
$(RM_COM) $(RMFILE_OPT) $(PREFIX)/lib/gambas3/gb.gui.so
$(RM_COM) $(RMFILE_OPT) $(PREFIX)/lib/gambas3/gb.image.so
$(RM_COM) $(RMFILE_OPT) $(PREFIX)/lib/gambas3/gb.qt4.so
$(RM_COM) $(RMFILE_OPT) $(PREFIX)/lib/gambas3/gb.qt4.so
10 changes: 6 additions & 4 deletions Scripts/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#!/usr/bin/make -f

include i-nex.mk
include ../i-nex.mk

install: install-set-executables
$(INSTALL) 0755 i-nex $(DESTDIR)$(PREFIX)$(bindir)
$(INSTALL) 0755 i-nex-lspci $(DESTDIR)$(PREFIX)$(bindir)

install-set-executables:
chmod +x i-nex
chmod +x i-nex-lspci
install: install-set-executables
$(INSTALL) 0755 i-nex $(DESTDIR)$(PREFIX)$(bindir)
$(INSTALL) 0755 i-nex-lspci $(DESTDIR)$(PREFIX)$(bindir)
mkdir -p $(DESTDIR)$(PREFIX)$(bindir)

0 comments on commit 4710c07

Please sign in to comment.