Changeset 1230 for trunk/Makefile


Ignore:
Timestamp:
Feb 12, 2004, 1:48:28 PM (22 years ago)
Author:
bird
Message:

Install intl dll.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    • Property cvs2svn:cvs-rev changed from 1.75 to 1.76
    r1229 r1230  
    13251325        cp $(PATH_TOP)/src/misc/dllar.cmd           $(ALL_PREFIX)/bin
    13261326        cp $(PATH_TOP)/src/misc/gccenv.cmd          $(ALL_PREFIX)/bin
     1327        if test -f $(PATH_TOP)/tools/usr/lib/Iintl6i.dll; then \
     1328                cp $(PATH_TOP)/tools/usr/lib/Iintl6i.dll $(ALL_PREFIX)/lib; \
     1329        else \
     1330                if test -f $(PATH_TOP)/tools/usr/lib/intl6i.dll; then \
     1331                        cp $(PATH_TOP)/tools/usr/lib/intl6i.dll $(ALL_PREFIX)/lib; \
     1332                fi \
     1333        fi
    13271334        ar cr $(ALL_PREFIX)/lib/m.a
    1328 
    1329                
    1330 dejagnu:
    1331 # nothing to make at the moment, it's just a all install stuff it seems.
    1332 
    1333 requires_autoconf_2_52_DEJAGNU_CONFIGURE_DIRS = \
    1334 src/misc/dejagnu \
    1335 src/misc/dejagnu/contrib/bluegnu2.0.3 \
    1336 src/misc/dejagnu/contrib/bluegnu2.0.3/doc \
    1337 src/misc/dejagnu/contrib/bluegnu2.0.3/example \
    1338 src/misc/dejagnu/contrib/bluegnu2.0.3/example/calc \
    1339 src/misc/dejagnu/contrib/bluegnu2.0.3/testsuite \
    1340 src/misc/dejagnu/example/calc \
    1341 src/misc/dejagnu/example/hello
    1342 
    1343 .PHONY: dejagnu-autoconf-refresh dejagnu-autoconf-rerun dejagnu-autoconf-clean dejagnu-autoconf-remove
    1344 dejagnu-autoconf-refresh dejagnu-autoconf-rerun dejagnu-autoconf-clean dejagnu-autoconf-remove:
    1345 ifeq "$(BUILD_PLATFORM)" "LINUX"
    1346         -$(SH) $(PATH_TOP)/xfix.sh
    1347 endif
    1348         for dir in $(DEJAGNU_CONFIGURE_DIRS); do \
    1349                 if $(MAKE) $(MAKEOPT) -j 1 $(@:dejagnu-autoconf-%=%) -f $(PWD)/config.gmk -C $$dir ; then \
    1350                         true; \
    1351                 else \
    1352                         exit 8; \
    1353                 fi \
    1354         done
    1355 
    1356 
    1357        
    1358 #
    1359 # Expect
    1360 #
    1361 
    1362 expect:
    1363 
    1364 
    1365 # build the components.
    1366 .PHONY: expect-build expect-install expect-configure
    1367 expect-build expect-install expect-configure:
    1368         mkdir -p $(PATH_OBJ)/misc/expect
    1369         $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/misc/expect -f $(MAKEFILE) $@-it
    1370 
    1371 
    1372 # When changed directory
    1373 expect-build-it: \
    1374                 $(PATH_OBJ)/misc/expect/.ts.configured
    1375         $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/misc/expect
    1376                
    1377 # configure it (invoked after directory change).
    1378 #       We set CC to help configure finding it.
    1379 #       And we reconfigure libiberty to the gcc one.
    1380 expect-configure-it $(PATH_OBJ)/misc/expect/.ts.configured: $(PATH_TOP)/src/misc/expect/configure
    1381 ifeq "$(BUILD_PLATFORM)" "OS2"
    1382         $(ASH) -c " \
    1383                 export CC=\"gcc.exe\" ; \
    1384                 $< \
    1385                 --disable-shared \
    1386                 --host=i386-pc-os2-emx \
    1387                 --with-tclconfig=$(UNIXROOT)/usr/lib \
    1388                 --with-tclinclude=$(UNIXROOT)/usr/lib/tcl8.0/include \
    1389                 --enable-gcc \
    1390                 $(BUILD_ENABLE_SYMBOLS) \
    1391                 --prefix=$(PATH_BUILTTOOLSD) "
    1392 else
    1393         $(ASH) -c " \
    1394                 $< \
    1395                 --enable-gcc \
    1396                 $(BUILD_ENABLE_SYMBOLS) \
    1397                 --prefix=$(PATH_BUILTTOOLSD) "
    1398 endif           
    1399         touch $(PATH_OBJ)/misc/expect/.ts.configured
    1400        
    1401        
    1402 # install to builttools (if anywhere!)
    1403 expect-install-it:
    1404         $(MAKE) $(MAKEOPT) prefix=$(PATH_BUILTTOOLSD) install
    1405        
    1406 
    1407 
    1408 EXPECT_CONFIGURE_DIRS = \
    1409 src/misc/expect
    1410 # skipping testsuite for now as it requires some .m4 files we don't have.
    1411 #src/misc/expect/testsuite
    1412 
    1413 .PHONY: expect-autoconf-refresh expect-autoconf-rerun expect-autoconf-clean expect-autoconf-remove
    1414 expect-autoconf-refresh expect-autoconf-rerun expect-autoconf-clean expect-autoconf-remove:
    1415 ifeq "$(BUILD_PLATFORM)" "LINUX"
    1416         -$(SH) $(PATH_TOP)/xfix.sh
    1417 endif
    1418         for dir in $(EXPECT_CONFIGURE_DIRS); do \
    1419                 if $(MAKE) $(MAKEOPT) -j 1 $(@:expect-autoconf-%=%) -f $(PWD)/config.gmk -C $$dir ; then \
    1420                         true; \
    1421                 else \
    1422                         exit 8; \
    1423                 fi \
    1424         done
    1425 
    14261335                       
    14271336
Note: See TracChangeset for help on using the changeset viewer.