Author: qwell
Date: Fri Jul 27 16:55:56 2007
New Revision: 2789
URL: http://svn.digium.com/view/zaptel?view=rev&rev=2789
Log:
Rearrange and add some Makefile targets to be in line with the original
intentions
of the addition of targets such as install-programs.
Modified:
branches/1.2/Makefile
Modified: branches/1.2/Makefile
URL:
http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=2789&r1=2788&r2=2789
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Fri Jul 27 16:55:56 2007
@@ -188,9 +188,9 @@
endif
MAN_PAGES = $(MAN_PAGES_BASE:%=doc/%.8)
-all: programs modules
-
-programs: $(BINS) $(LIBTONEZONE_SO)
+all: programs modules $(LIBTONEZONE_SO)
+
+programs: $(BINS)
ifeq ($(BUILDVER),linux24)
modules: prereq $(MODULESO) wct4xxp/wct4xxp.o
@@ -395,7 +395,30 @@
tar -zxf mISDNuser.tar.gz
$(MAKE) -C mISDNuser install
-install: install-modules install-programs
+install: all devices install-modules install-libs install-include firmware
+ install -D -m 755 ztcfg $(DESTDIR)$(SBINDIR)/ztcfg
+ifneq (,$(wildcard sethdlc-new))
+ install -D -m 755 sethdlc-new $(DESTDIR)$(SBINDIR)/sethdlc
+else
+ ifneq (,$(wildcard sethdlc))
+ install -D -m 755 sethdlc $(DESTDIR)$(SBINDIR)/sethdlc
+ endif
+endif
+ifneq (,$(wildcard zttool))
+ install -D -m 755 zttool $(DESTDIR)$(SBINDIR)/zttool
+endif
+ install -d $(DESTDIR)$(MANDIR)
+ install -m 644 $(MAN_PAGES) $(DESTDIR)$(MANDIR)
+ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
+ install -D -m 644 zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE)
+endif
+ build_tools/genmodconf $(BUILDVER) "$(DESTDIR)" "$(filter-out zaptel
ztdummy zttranscode wctc4xxp ztdynamic xpp_usb,$(MODULES)) $(MODULE_ALIASES)"
+ifeq (,$(DESTDIR))
+ @if [ -d /etc/modutils ]; then \
+ /sbin/update-modules ; \
+ fi
+endif
+
@echo "###################################################"
@echo "###"
@echo "### Zaptel installed successfully."
@@ -422,21 +445,11 @@
rm -f $(DESTDIR)$(MODS_DIR)/wcfxs.o
[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-# All the userspace components. Common to all the system:
-install-programs: programs devices firmware
- install -D -m 755 ztcfg $(DESTDIR)$(SBINDIR)/ztcfg
-ifneq (,$(wildcard sethdlc-new))
- install -D -m 755 sethdlc-new $(DESTDIR)$(SBINDIR)/sethdlc
-else
- ifneq (,$(wildcard sethdlc))
- install -D -m 755 sethdlc $(DESTDIR)$(SBINDIR)/sethdlc
- endif
-endif
-ifneq (,$(wildcard zttool))
- install -D -m 755 zttool $(DESTDIR)$(SBINDIR)/zttool
-endif
- install -d $(DESTDIR)$(MANDIR)
- install -m 644 $(MAN_PAGES) $(DESTDIR)$(MANDIR)
+install-programs: $(BINS)
+ install -d $(DESTDIR)$(SBINDIR)
+ install -m 755 $(BINS) $(DESTDIR)$(SBINDIR)
+
+install-libs: $(LIBTONEZONE_SO)
install -D -m 755 $(LIBTONEZONE_SO)
$(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
[ `id -u` = 0 ] && /sbin/ldconfig || :
rm -f $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO)
@@ -447,18 +460,11 @@
ifneq (,$(SELINUX_ENABLED))
/sbin/restorecon -v $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO)
endif
+
+install-include:
install -d $(DESTDIR)$(INCLUDE_DIR)/linux
install -m 644 zaptel.h torisa.h $(DESTDIR)$(INCLUDE_DIR)/linux/
install -m 644 tonezone.h $(DESTDIR)$(INCLUDE_DIR)
-ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
- install -D -m 644 zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE)
-endif
- build_tools/genmodconf $(BUILDVER) "$(DESTDIR)" "$(filter-out zaptel
ztdummy zttranscode wctc4xxp ztdynamic xpp_usb,$(MODULES)) $(MODULE_ALIASES)"
-ifeq (,$(DESTDIR))
- @if [ -d /etc/modutils ]; then \
- /sbin/update-modules ; \
- fi
-endif
install-udev: devices
_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.com--
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
