[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: Makefile
User: ahvezda
Date: 05/02/12 23:47:33
Modified: . Makefile
Log:
Removed the excessive symbol_install dependency in various *_install
targets. This should fix the "symbols get install many times in the
gEDA suite installer". For now, removed setup from being built as it
is still a gtk+ 1.2.x only application and setup isn't support anymore.
Revision Changes Path
1.65 +27 -30 eda/geda/devel/Makefile
http://geda.seul.org/cgi-bin/viewcvs.cgi/eda/geda/Makefile/Makefile.diff?r1=1.64&r2=1.65
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Makefile
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/Makefile,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- Makefile 28 Dec 2004 07:09:08 -0000 1.64
+++ Makefile 13 Feb 2005 04:47:33 -0000 1.65
@@ -40,7 +40,6 @@
@echo ""
@echo "Type:"
@echo ""
- @echo "${MAKE} xinstall Builds and runs gEDA Suite Setup (alpha)"
@echo "${MAKE} install Installs gEDA/gaf into $(prefix)"
@echo "${MAKE} uninstall Uninstall gEDA/gaf from $(prefix)"
@echo "${MAKE} clean Simple clean only (remove all .o and bins)"
@@ -109,17 +108,17 @@
##----------------------------------------------------------------------
# This installs libgeda and symbols and just builds gschem and gnetlist
-all: libgeda symbols gschem gnetlist gattrib gsymcheck geda setup utils docs examples
+all: libgeda symbols gschem gnetlist gattrib gsymcheck geda utils docs examples
# libgeda_install or symbols_install is not needed since the default
# libgeda does a make install (ditto for symbols)
# This also installs gschem, gnetlist, and gsymcheck
-install: gschem_install gnetlist_install gattrib_install gsymcheck_install geda_install\
- setup_install utils_install docs_install examples_install
+install: gschem_install gnetlist_install gattrib_install gsymcheck_install \
+ geda_install utils_install docs_install examples_install
-uninstall: utils_uninstall gsymcheck_uninstall gattrib_uninstall gnetlist_uninstall \
- gschem_uninstall symbols_uninstall libgeda_uninstall \
- geda_uninstall setup_uninstall docs_uninstall examples_uninstall
+uninstall: utils_uninstall gsymcheck_uninstall gattrib_uninstall \
+ gnetlist_uninstall gschem_uninstall symbols_uninstall \
+ libgeda_uninstall geda_uninstall docs_uninstall examples_uninstall
# It runs X installation using setup files from:
# 1) CVS directory
@@ -165,34 +164,33 @@
gnetlist_tarball \
gschem_tarball \
gsymcheck_tarball \
- setup_tarball \
symbols_tarball \
utils_tarball \
libgeda_tarball
# This does a maintainer-clean removes EVERYTHING that's config/built
maint: libgeda_maint symbols_maint gschem_maint gnetlist_maint gattrib_maint \
- gsymcheck_maint utils_maint geda_maint setup_maint docs_maint \
+ gsymcheck_maint utils_maint geda_maint docs_maint \
examples_maint
# This does a plain clean
clean: libgeda_clean symbols_clean gschem_clean gnetlist_clean gattrib_clean \
- gsymcheck_clean utils_clean geda_clean setup_clean docs_clean \
+ gsymcheck_clean utils_clean geda_clean docs_clean \
examples_clean
# This does a dist clean
distclean: libgeda_distclean symbols_distclean gschem_distclean \
- gnetlist_distclean gattrib_distclean gsymcheck_distclean utils_distclean \
- geda_distclean setup_distclean docs_distclean examples_distclean
+ gnetlist_distclean gattrib_distclean gsymcheck_distclean \
+ utils_distclean geda_distclean docs_distclean examples_distclean
# This just does the appropriate ./configure --prefix=...
-config: libgeda_config symbols_config gschem_config gnetlist_config gattrib_config \
- gsymcheck_config utils_config geda_config setup_config docs_config \
+config: libgeda_config symbols_config gschem_config gnetlist_config \
+ gattrib_config gsymcheck_config utils_config geda_config docs_config \
examples_config
# This recreates all ./configure scripts and Makefile.in files
-reconfig: libgeda_reconfig symbols_reconfig gschem_reconfig gnetlist_reconfig gattrib_reconfig \
- gsymcheck_reconfig utils_reconfig geda_reconfig setup_reconfig \
+reconfig: libgeda_reconfig symbols_reconfig gschem_reconfig gnetlist_reconfig \
+ gattrib_reconfig gsymcheck_reconfig utils_reconfig geda_reconfig \
docs_reconfig examples_reconfig
# This creates all *.c files from *.nw files
@@ -201,13 +199,13 @@
# This recreates all ./configure scripts and Makefile.in files ready
# for distribution (removes dependency checking)
distconfig: libgeda_distconfig symbols_distconfig gschem_distconfig \
- gnetlist_distconfig gattrib_distconfig gsymcheck_distconfig utils_distconfig \
- geda_distconfig setup_distconfig docs_distconfig \
+ gnetlist_distconfig gattrib_distconfig gsymcheck_distconfig \
+ utils_distconfig geda_distconfig docs_distconfig \
examples_distconfig
dist: libgeda_dist symbols_dist gschem_dist \
gnetlist_dist gattrib_dist gsymcheck_dist utils_dist \
- geda_dist setup_dist docs_dist examples_dist
+ geda_dist docs_dist examples_dist
mv -f libgeda/libgeda*.tar.gz .
mv -f symbols/geda-symbols*.tar.gz .
mv -f gschem/geda-gschem*.tar.gz .
@@ -216,13 +214,12 @@
mv -f gsymcheck/geda-gsymcheck*.tar.gz .
mv -f utils/geda-utils*.tar.gz .
mv -f geda/geda-*.tar.gz .
- mv -f setup/geda-setup-*.tar.gz .
mv -f docs/geda-docs*.tar.gz .
mv -f examples/geda-examples*.tar.gz .
distcheck: libgeda_distcheck symbols_distcheck gschem_distcheck \
- gnetlist_distcheck gattrib_distcheck gsymcheck_distcheck utils_distcheck \
- geda_distcheck setup_distcheck docs_distcheck examples_distcheck
+ gnetlist_distcheck gattrib_distcheck gsymcheck_distcheck \
+ utils_distcheck geda_distcheck docs_distcheck examples_distcheck
mv -f libgeda/libgeda*.tar.gz .
mv -f symbols/symbols*.tar.gz .
mv -f gschem/geda-gschem*.tar.gz .
@@ -231,12 +228,11 @@
mv -f gsymcheck/geda-gsymcheck*.tar.gz .
mv -f utils/geda-utils*.tar.gz .
mv -f geda/geda-*.tar.gz .
- mv -f setup/setup-*.tar.gz .
mv -f docs/geda-docs*.tar.gz .
mv -f examples/geda-examples*.tar.gz .
# This recreates all ./configure scripts and Makefile.in files
-# TODO: added geda and setup
+# TODO: added geda
proto: libgeda_proto gschem_proto gnetlist_proto gattrib_proto gsymcheck_proto
############################################################################
@@ -285,7 +281,7 @@
$(DIR_PREFIX)gschem$(CD_VERSION)/src/gschem
@echo gschem Built
-gschem_install: libgeda_install symbols_install \
+gschem_install: libgeda_install \
$(DIR_PREFIX)gschem$(CD_VERSION)/configure \
$(DIR_PREFIX)gschem$(CD_VERSION)/config.h \
$(DIR_PREFIX)gschem$(CD_VERSION)/src/gschem
@@ -332,7 +328,7 @@
$(DIR_PREFIX)gnetlist$(CD_VERSION)/src/gnetlist
@echo gnetlist Built
-gnetlist_install: libgeda_install symbols_install \
+gnetlist_install: libgeda_install \
$(DIR_PREFIX)gnetlist$(CD_VERSION)/configure \
$(DIR_PREFIX)gnetlist$(CD_VERSION)/config.h \
$(DIR_PREFIX)gnetlist$(CD_VERSION)/src/gnetlist
@@ -376,7 +372,7 @@
$(DIR_PREFIX)gattrib$(CD_VERSION)/src/gattrib
@echo gattrib Built
-gattrib_install: libgeda_install symbols_install \
+gattrib_install: libgeda_install \
$(DIR_PREFIX)gattrib$(CD_VERSION)/configure \
$(DIR_PREFIX)gattrib$(CD_VERSION)/config.h \
$(DIR_PREFIX)gattrib$(CD_VERSION)/src/gattrib
@@ -420,7 +416,7 @@
$(DIR_PREFIX)gsymcheck$(CD_VERSION)/src/gsymcheck
@echo gsymcheck Built
-gsymcheck_install: libgeda_install symbols_install \
+gsymcheck_install: libgeda_install \
$(DIR_PREFIX)gsymcheck$(CD_VERSION)/configure \
$(DIR_PREFIX)gsymcheck$(CD_VERSION)/config.h \
$(DIR_PREFIX)gsymcheck$(CD_VERSION)/src/gsymcheck
@@ -464,7 +460,7 @@
$(DIR_PREFIX)utils$(CD_VERSION)/src/gmk_sym
@echo utils Built
-utils_install: libgeda_install symbols_install \
+utils_install: libgeda_install \
$(DIR_PREFIX)utils$(CD_VERSION)/configure \
$(DIR_PREFIX)utils$(CD_VERSION)/config.h \
$(DIR_PREFIX)utils$(CD_VERSION)/src/gmk_sym
@@ -618,7 +614,8 @@
libgeda_uninstall: libgeda$(CD_VERSION)/config.h
( cd libgeda$(CD_VERSION); ${MAKE} uninstall )
-libgeda_install: libgeda$(CD_VERSION)/configure \
+libgeda_install: symbols_install \
+ libgeda$(CD_VERSION)/configure \
libgeda$(CD_VERSION)/config.h
( cd libgeda$(CD_VERSION); ${MAKE} install )