Changeset beceda0 in freewrt


Ignore:
Timestamp:
Jan 17, 2007, 10:30:39 PM (19 years ago)
Author:
Phil Sutter <n0-1@…>
Children:
0adcf17
Parents:
e97cbc4c
Message:

convert to new style

git-svn-id: ​svn://www.freewrt.org/branches/common-adk@1627 afb5a338-a214-0410-bd46-81f09a774fd1

Location:
package
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • package/olsrd/Makefile

    re97cbc4c rbeceda0  
    55# or at http://www.freewrt.org/licence for details.
    66
    7 include $(TOPDIR)/rules.mk
     7include ${TOPDIR}/rules.mk
    88
    99PKG_NAME:=              olsrd
    … …  
    1212PKG_MD5SUM:=            9807d4451e65cb4ec385155eef7bf3cf
    1313PKG_INIT:=              60
     14PKG_SOURCE_URL:=        http://www.olsr.org/releases/0.4
     15PKG_SOURCE:=            ${PKG_NAME}-${PKG_VERSION}.tar.bz2
    1416
    15 PKG_SOURCE_URL:=        http://www.olsr.org/releases/0.4
    16 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.bz2
    17 
    18 include $(TOPDIR)/mk/package.mk
     17include ${TOPDIR}/mk/package.mk
    1918
    2019define PKG_mod_template
    2120
    22 $$(IPKG_$(1)):
    23         install -d -m0755 $$(IDIR_$(1))/usr/lib
    24         install -m0755 $(WRKINST)/usr/lib/olsrd_$(2).so.* $$(IDIR_$(1))/usr/lib/
    25         $(RSTRIP) $$(IDIR_$(1))
    26         $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
     21INSTALL_MODS_$${FWRT_PACKAGE_OLSRD_${1}}+=      ${2}-install
     22
     23${2}-install:
     24        $${INSTALL_DIR} $${IDIR_${1}}/usr/lib
     25        $${CP} $${WRKINST}/usr/lib/olsrd_${2}.so.* $${IDIR_${1}}/usr/lib/
    2726
    2827endef
    2928
    30 $(eval $(call PKG_template,OLSRD,olsrd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    31 $(eval $(call PKG_template,OLSRD_MOD_DOT_DRAW,olsrd-mod-dot-draw,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    32 $(eval $(call PKG_template,OLSRD_MOD_DYN_GW,olsrd-mod-dyn-gw,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    33 $(eval $(call PKG_template,OLSRD_MOD_HTTPINFO,olsrd-mod-httpinfo,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    34 $(eval $(call PKG_template,OLSRD_MOD_NAMESERVICE,olsrd-mod-nameservice,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    35 $(eval $(call PKG_template,OLSRD_MOD_POWER,olsrd-mod-power,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    36 $(eval $(call PKG_template,OLSRD_MOD_SECURE,olsrd-mod-secure,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    37 $(eval $(call PKG_template,OLSRD_MOD_TAS,olsrd-mod-tas,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
     29$(eval $(call PKG_template,OLSRD,olsrd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
     30$(eval $(call PKG_template,OLSRD_MOD_DOT_DRAW,olsrd-mod-dot-draw,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
     31$(eval $(call PKG_template,OLSRD_MOD_DYN_GW,olsrd-mod-dyn-gw,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
     32$(eval $(call PKG_template,OLSRD_MOD_HTTPINFO,olsrd-mod-httpinfo,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
     33$(eval $(call PKG_template,OLSRD_MOD_NAMESERVICE,olsrd-mod-nameservice,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
     34$(eval $(call PKG_template,OLSRD_MOD_POWER,olsrd-mod-power,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
     35$(eval $(call PKG_template,OLSRD_MOD_SECURE,olsrd-mod-secure,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
     36$(eval $(call PKG_template,OLSRD_MOD_TAS,olsrd-mod-tas,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
    3837
    3938$(eval $(call PKG_mod_template,OLSRD_MOD_DOT_DRAW,dot_draw))
    … …  
    4241$(eval $(call PKG_mod_template,OLSRD_MOD_NAMESERVICE,nameservice))
    4342$(eval $(call PKG_mod_template,OLSRD_MOD_POWER,power))
    44 $(eval $(call PKG_mod_template,OLSRD_MOD_SECURE,secure))
    4543$(eval $(call PKG_mod_template,OLSRD_MOD_TAS,tas))
    4644
    47 $(WRKBUILD)/.configured:
    48         touch $@
    4945
    50 $(WRKBUILD)/.built:
    51         rm -rf $(WRKINST)
    52         mkdir -p $(WRKINST)
    53         $(MAKE) -C "$(WRKBUILD)" \
    54                 $(TARGET_CONFIGURE_OPTS) \
     46do-build:
     47        rm -rf ${WRKINST}
     48        mkdir -p ${WRKINST}
     49        ${MAKE} -C "${WRKBUILD}" \
     50                ${TARGET_CONFIGURE_OPTS} \
    5551                NODEBUG=1 \
    56                 OFLAGS="$(TARGET_CFLAGS)" \
     52                OFLAGS="${TARGET_CFLAGS}" \
    5753                OS="linux" \
    58                 INSTALL_PREFIX="$(WRKINST)" \
     54                INSTALL_PREFIX="${WRKINST}" \
    5955                STRIP="/bin/true" \
    6056                all libs install install_libs
    61         touch $@
    6257
    63 $(IPKG_OLSRD):
    64         install -d -m0755 $(IDIR_OLSRD)/etc
    65         $(CP) $(WRKINST)/etc/olsrd.conf $(IDIR_OLSRD)/etc/
    66         install -d -m0755 $(IDIR_OLSRD)/usr/sbin
    67         $(CP) $(WRKINST)/usr/sbin/olsrd $(IDIR_OLSRD)/usr/sbin/
    68         install -d -m0755 $(IDIR_OLSRD)/etc/init.d
    69         install -m0755 ./files/olsrd.init \
    70                 $(IDIR_OLSRD)/etc/init.d/S$(PKG_INIT)olsrd
    71         $(RSTRIP) $(IDIR_OLSRD)
    72         $(IPKG_BUILD) $(IDIR_OLSRD) $(PACKAGE_DIR)
     58do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
     59        ${INSTALL_DIR} ${IDIR_OLSRD}/etc/init.d
     60        ${INSTALL_DIR} ${IDIR_OLSRD}/usr/sbin
     61        ${INSTALL_DATA} ${WRKINST}/etc/olsrd.conf ${IDIR_OLSRD}/etc/
     62        ${INSTALL_BIN} ${WRKINST}/usr/sbin/olsrd ${IDIR_OLSRD}/usr/sbin/
     63        ${INSTALL_BIN} ./files/olsrd.init \
     64                ${IDIR_OLSRD}/etc/init.d/S${PKG_INIT}olsrd
    7365
    74 $(IPKG_OLSRD_MOD_SECURE): $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d/olsrd_secure_key
    75 
    76 $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d/olsrd_secure_key:
    77         install -d -m0755 $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d
    78         $(CP) ./files/olsrd_secure_key $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d/
     66INSTALL_MODS_${FWRT_PACKAGE_OLSRD_MOD_SECURE}+= dot_draw-install
     67dot_draw-install:
     68        ${INSTALL_DIR} ${IDIR_OLSRD_MOD_SECURE}/usr/lib
     69        ${INSTALL_DIR} ${IDIR_OLSRD_MOD_SECURE}/etc/olsrd.d
     70        ${CP} ${WRKINST}/usr/lib/olsrd_dot_draw.so.* ${IDIR_OLSRD_MOD_SECURE}/usr/lib/
     71        ${CP} ./files/olsrd_secure_key ${IDIR_OLSRD_MOD_SECURE}/etc/olsrd.d/
    7972
    8073include ${TOPDIR}/mk/pkg-bottom.mk

  • package/opencdk/Makefile

    re97cbc4c rbeceda0  
    55# or at http://www.freewrt.org/licence for details.
    66
    7 include $(TOPDIR)/rules.mk
     7include ${TOPDIR}/rules.mk
    88
    99PKG_NAME:=              opencdk
    … …  
    1717                        ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/opencdk/ \
    1818                        http://josefsson.org/gnutls/releases/opencdk/
    19 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.bz2
     19PKG_SOURCE:=            ${PKG_NAME}-${PKG_VERSION}.tar.bz2
    2020
    21 include $(TOPDIR)/mk/package.mk
     21include ${TOPDIR}/mk/package.mk
    2222
    23 $(eval $(call PKG_template,LIBOPENCDK,libopencdk,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
     23$(eval $(call PKG_template,LIBOPENCDK,libopencdk,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
    2424
    25 $(WRKBUILD)/.configured:
    26         (cd $(WRKBUILD); rm -rf config.{cache,status} ; \
     25CONFIGURE_STYLE:=       gnu
     26CONFIGURE_ARGS+=        --with-libgcrypt-prefix="${STAGING_DIR}/usr"
     27BUILD_STYLE:=           auto
     28INSTALL_STYLE:=         auto
     29
     30pre-configure:
     31        (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
    2732                touch configure.ac ; \
    2833                touch acinclude.m4 ; \
    … …  
    3136                touch config.h.in ; \
    3237                touch configure ; \
    33                 $(TARGET_CONFIGURE_OPTS) \
    34                 CFLAGS="$(TARGET_CFLAGS)" \
    35                 CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
    36                 LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
    37                 ./configure \
    38                 --target=$(GNU_TARGET_NAME) \
    39                 --host=$(GNU_TARGET_NAME) \
    40                 --build=$(GNU_HOST_NAME) \
    41                 --program-prefix="" \
    42                 --program-suffix="" \
    43                 --prefix=/usr \
    44                 --exec-prefix=/usr \
    45                 --bindir=/usr/bin \
    46                 --datadir=/usr/share \
    47                 --includedir=/usr/include \
    48                 --infodir=/usr/share/info \
    49                 --libdir=/usr/lib \
    50                 --libexecdir=/usr/lib \
    51                 --localstatedir=/var \
    52                 --mandir=/usr/share/man \
    53                 --sbindir=/usr/sbin \
    54                 --sysconfdir=/etc \
    55                 --disable-nls \
    56                 --enable-shared \
    57                 --enable-static \
    58                 --disable-rpath \
    59                 --with-libgcrypt-prefix="$(STAGING_DIR)/usr" \
    60         );
    61         touch $@
     38        )
    6239
    63 $(WRKBUILD)/.built:
    64         rm -rf $(WRKINST)
    65         mkdir -p $(WRKINST)
    66         $(MAKE) -C $(WRKBUILD) \
    67                 DESTDIR="$(WRKINST)" \
    68                 all install
    69         touch $@
    70 
    71 $(IPKG_LIBOPENCDK):
    72         install -m0755 -d $(IDIR_LIBOPENCDK)/usr/lib
    73         $(CP) $(WRKINST)/usr/lib/libopencdk.so.* $(IDIR_LIBOPENCDK)/usr/lib/
    74         $(RSTRIP) $(IDIR_LIBOPENCDK)
    75         $(IPKG_BUILD) $(IDIR_LIBOPENCDK) $(PACKAGE_DIR)
    76 
    77 $(STAGING_DIR)/usr/lib/libopencdk.so: $(WRKBUILD)/.built
    78         mkdir -p $(STAGING_DIR)/usr/bin
    79         $(CP) $(WRKINST)/usr/bin/opencdk-config $(STAGING_DIR)/usr/bin/
    80         mkdir -p $(STAGING_DIR)/usr/include
    81         $(CP) $(WRKINST)/usr/include/opencdk.h $(STAGING_DIR)/usr/include/
    82         mkdir -p $(STAGING_DIR)/usr/lib
    83         $(CP) $(WRKINST)/usr/lib/libopencdk.{a,so*} $(STAGING_DIR)/usr/lib/
    84         touch $@
    85 
    86 install-dev: $(STAGING_DIR)/usr/lib/libopencdk.so
    87 
    88 uninstall-dev:
    89         rm -rf \
    90                 $(STAGING_DIR)/usr/bin/opencdk-config \
    91                 $(STAGING_DIR)/usr/include/opencdk.h \
    92                 $(STAGING_DIR)/usr/lib/libopencdk.{a,so*} \
    93 
    94 compile-targets: install-dev
    95 clean-targets: uninstall-dev
     40post-install:
     41        ${INSTALL_DIR} ${IDIR_LIBOPENCDK}/usr/lib
     42        ${CP} ${WRKINST}/usr/lib/libopencdk.so.* ${IDIR_LIBOPENCDK}/usr/lib/
    9643
    9744include ${TOPDIR}/mk/pkg-bottom.mk
Note: See TracChangeset for help on using the changeset viewer.