Skip to content

Commit

Permalink
Fixes for new standards
Browse files Browse the repository at this point in the history
  • Loading branch information
eloaders committed Feb 6, 2014
1 parent 8a93e93 commit 664a063
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
16 changes: 7 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
#!/usr/bin/make -f
include i-nex.mk

make: build-inex
build-inex:
./src/configure
$(MAKE) -C src
cd ./src && ./configure --bindir=$(bindir)
$(MAKE) -C pixmaps
$(MAKE) -C JSON

$(MAKE) -C src
deb:

$(AS_ROOT) $(PKG_INSTALL) $(dependency_build)
Expand Down Expand Up @@ -88,7 +87,8 @@ self:
printf "\033[1;31m:: \033[0m$1\n" & $(MAKESELF) $(MAKESELF_OPT) --bzip2 --complevel $(COMPRESSION_SELF_LEVEL) ./inex i-nex.$(ARCH)_git$(GIT_RV).bzip2.run $(APP_NAME) $(INSTALL_SELF_SCRIPT); \
fi
mv ./*.run ../


distclean: clean
clean:

$(RM_COM) $(RMDIR_OPT) `find . -name ".gambas"`
Expand Down Expand Up @@ -124,7 +124,6 @@ install:
chmod +x debian/check_kernel
chmod +x debian/i-nex-lspci
$(INSTALL) 0755 i-nex $(DESTDIR)$(bindir)
$(INSTALL) 0755 src/i-nex/i-nex.gambas $(DESTDIR)$(bindir)
$(INSTALL) 0755 debian/i-nex.desktop $(DESTDIR)/usr/share/applications/
$(INSTALL) 0755 debian/check_kernel $(DESTDIR)/usr/bin/
$(INSTALL) 0755 debian/i-nex-lspci $(DESTDIR)/usr/bin/
Expand All @@ -138,6 +137,7 @@ install:
$(MAKE) -C manpages install
$(MAKE) -C docs install
$(MAKE) -C JSON install
$(MAKE) -C src install

uninstall:

Expand Down Expand Up @@ -173,6 +173,4 @@ rmgambas:
$(RM_COM) $(RMFILE_OPT) /usr/lib/gambas3/gb.gui.opengl.so
$(RM_COM) $(RMFILE_OPT) /usr/lib/gambas3/gb.gui.so
$(RM_COM) $(RMFILE_OPT) /usr/lib/gambas3/gb.image.so
$(RM_COM) $(RMFILE_OPT) /usr/lib/gambas3/gb.qt4.so

make: build-inex
$(RM_COM) $(RMFILE_OPT) /usr/lib/gambas3/gb.qt4.so
1 change: 0 additions & 1 deletion src/VERSION

This file was deleted.

0 comments on commit 664a063

Please sign in to comment.