Changeset 29

Timestamp:

04/28/07 16:30:40 (2 years ago)

Author:

daboo

Message:

More make file tweaks for better build behavior.

Location:

Mulberry/trunk

Files:

• Build/Makefile (modified) (4 diffs)
• Makefile (modified) (2 diffs)
• Plug-ins/Makefile (modified) (2 diffs)

Mulberry/trunk/Build/Makefile

@@ -62 +62 @@
 STL_LIB := ${DEVHOME}/STLport/lib/libstlport_gcc.so
 GCCSTD_LIB := /usr/local/lib/libstdc++.so.2.10.0
-
-# Plugins to build
-BUILD_PLUGINS := CRAM-MD5 DIGEST-MD5 GSSAPI Kerberos \
-                        CommunicatorAdbkIO Eudora4AdbkIO EudoraAdbkIO NetscapeAdbkIO \
-                        PineAdbkIO QuickmailAdbkIO vCardAdbkIO \
-                        ISpell \
-                        GPG SMIME SSL
-
-# Plugins not built
-NO_BUILD_PLUGINS := PGP QuickmailProAdbkIO POPPASSD URLPASSD
 
 STATIC_FLAGS := static=1
@@ -133 +123 @@
         @echo ""
         @echo "--> Removing current plugins"
+        @(cd ${PLUGINS_DIR}; ${MAKE} clean)
         @rm -f ${PLUGINS_DIR}/*/*Plugin.so
         @rm -f ${PLUGINLIB_DIR}/*.a
@@ -147 +138 @@
         @ln -s ${RELEASE_DIR} ${LINK_DIR}
 
-pluginlib:
-        @echo ""
-        @echo "-->Building PluginLibrary"
-        @(cd ${PLUGINLIB_DIR}; makemake --bin_dir BIN; ${MAKE})
-
-plugins: pluginlib
+plugins:
+        @echo "-->Building Plugins"
         @rm -rf ${PLUGIN_RELEASE_DIR}; mkdir ${PLUGIN_RELEASE_DIR}
-        @for i in $(BUILD_PLUGINS); do \
-                ${MAKE} "PLUGIN=$$i" plugin; \
-        done
+        @(cd ${PLUGINS_DIR}; ${MAKE} all)
+        @echo "-->Copying Plugins"
+        @cp ${PLUGINS_DIR}/*/*Plugin.so ${PLUGIN_RELEASE_DIR}
+        @strip ${PLUGIN_RELEASE_DIR}/*Plugin.so
 
 pluginsnobuild:
-        @rm -rf ${PLUGIN_RELEASE_DIR}; mkdir ${PLUGIN_RELEASE_DIR}
-        @for i in $(BUILD_PLUGINS); do \
-                ${MAKE} "PLUGIN=$$i" pluginnobuild; \
-        done
-
-plugin:
-        @echo ""
-        @echo "-->Building ${PLUGIN}"
-        @(cd ${PLUGINS_DIR}/${PLUGIN}; makemake --bin_dir BIN; ${MAKE})
-        @echo "-->Copying ${PLUGIN}"
-        @cp ${PLUGINS_DIR}/${PLUGIN}/*Plugin.so ${PLUGIN_RELEASE_DIR}
-        @strip ${PLUGIN_RELEASE_DIR}/*Plugin.so
-
-pluginnobuild:
-        @echo ""
-        @echo "-->Copying ${PLUGIN}"
-        @cp ${PLUGINS_DIR}/${PLUGIN}/*Plugin.so ${PLUGIN_RELEASE_DIR}
+        @echo "-->Copying Plugins"
+        @cp ${PLUGINS_DIR}/*/*Plugin.so ${PLUGIN_RELEASE_DIR}
         @strip ${PLUGIN_RELEASE_DIR}/*Plugin.so
 
@@ -263 +236 @@
         @rm -rf ${RELEASE_DIR}
         @rm -rf ${RPM_DIR}
+
+install:
+        @cp ${RELEASE_DIR}/${GZIP_FILE} ~
+        @(cd ~; tar zxf ${GZIP_FILE}; rm ${GZIP_FILE})
+        

Mulberry/trunk/Makefile

@@ -40 +40 @@
          ln -s "Address IO" Address_IO; \
          ln -s "Pswd Change" Pswd_Change)
+        (cd ${MULBERRY_HOME}/Linux_v2; \
+         ./links.sh; \
+         makemake)
 
 buildjx:
@@ -46 +49 @@
 
 buildmulberry:
-        (cd ${MULBERRY_HOME}/Linux_v2; \
-         ./links.sh; \
-         makemake; \
-         make static -k)
-
-buildplugins:
         (cd ${MULBERRY_HOME}/Build; \
-         make plugins)
-        (cd ${MULBERRY_HOME}/Plug-ins; \
-         make install)
+         make static)
 
 init: jxsrc librariessrc mulberrysrc jxinit mulberryinit

Mulberry/trunk/Plug-ins/Makefile

@@ -2 +2 @@
 
 PLUGINS_DIR := ./
+PLUGINLIB_DIR := ${PLUGINS_DIR}/PluginLibrary
 
 # Plugins to build
@@ -31 +32 @@
         @echo "--> Removing current plugins"
         @rm -f ${PLUGINS_DIR}/*/*Plugin.so
+        @rm -f ${PLUGINLIB_DIR}/*.a
 
 plugins: