git.openpandora.org
/
pandora-libraries.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
acb9de5
)
Modified the makefile to link using g++ when linking with stdc++ on aTc request
author
sebt3
<sebastien.huss@gmail.com>
Wed, 23 Nov 2011 17:37:07 +0000
(12:37 -0500)
committer
sebt3
<sebastien.huss@gmail.com>
Wed, 23 Nov 2011 17:37:07 +0000
(12:37 -0500)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
b445b4c
..
e959de2
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-46,24
+46,24
@@
${SOLIB1}: ${ALLOBJ} ${XMLOBJ}
ln -f -s ${SOLIB1} ${SOLIB}
pndnotifyd: pndnotifyd.o ${SOLIB1}
ln -f -s ${SOLIB1} ${SOLIB}
pndnotifyd: pndnotifyd.o ${SOLIB1}
- ${C
C} -lstdc++
-o bin/pndnotifyd pndnotifyd.o ${SOLIB1}
+ ${C
XX}
-o bin/pndnotifyd pndnotifyd.o ${SOLIB1}
pndvalidator: pndvalidator.o ${SOLIB1}
pndvalidator: pndvalidator.o ${SOLIB1}
- ${C
C} -lstdc++
-o bin/pndvalidator pndvalidator.o ${SOLIB1}
+ ${C
XX}
-o bin/pndvalidator pndvalidator.o ${SOLIB1}
pnd_run: pnd_run.o ${SOLIB1}
pnd_run: pnd_run.o ${SOLIB1}
- ${C
C} -lstdc++
-o bin/pnd_run pnd_run.o ${SOLIB1}
+ ${C
XX}
-o bin/pnd_run pnd_run.o ${SOLIB1}
pnd_info: pnd_info.o ${SOLIB1}
pnd_info: pnd_info.o ${SOLIB1}
- ${C
C} -lstdc++
-o bin/pnd_info pnd_info.o ${SOLIB1}
+ ${C
XX}
-o bin/pnd_info pnd_info.o ${SOLIB1}
pndevmapperd: pndevmapperd.o ${SOLIB1}
pndevmapperd: pndevmapperd.o ${SOLIB1}
- ${C
C} -lstdc++
-o bin/pndevmapperd pndevmapperd.o ${SOLIB1}
+ ${C
XX}
-o bin/pndevmapperd pndevmapperd.o ${SOLIB1}
mmenu: mmenu.o mmui.o mmcache.o mmcat.o mmconf.o freedesktop_cats.o mmcustom_cats.o ${SOLIB1}
mmenu: mmenu.o mmui.o mmcache.o mmcat.o mmconf.o freedesktop_cats.o mmcustom_cats.o ${SOLIB1}
- ${C
C} -lstdc++
-o bin/mmenu mmenu.o mmui.o mmcache.o mmcat.o mmconf.o freedesktop_cats.o mmcustom_cats.o ${SOLIB1} -L${PNDSTUFF}/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_gfx
+ ${C
XX}
-o bin/mmenu mmenu.o mmui.o mmcache.o mmcat.o mmconf.o freedesktop_cats.o mmcustom_cats.o ${SOLIB1} -L${PNDSTUFF}/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_gfx
mmwrapper: mmwrapper.o ${SOLIB1}
mmwrapper: mmwrapper.o ${SOLIB1}
- ${C
C} -lstdc++
-o bin/mmwrapper mmwrapper.o ${SOLIB1}
+ ${C
XX}
-o bin/mmwrapper mmwrapper.o ${SOLIB1}
# deployment and assembly components
#
# deployment and assembly components
#
@@
-111,28
+111,28
@@
deploy:
#
conftest: conftest.o ${LIB}
#
conftest: conftest.o ${LIB}
- ${C
C} -lstdc++
-o bin/conftest conftest.o libpnd.a
+ ${C
XX}
-o bin/conftest conftest.o libpnd.a
discotest: discotest.o ${LIB}
discotest: discotest.o ${LIB}
- ${C
C} -lstdc++
-o bin/discotest discotest.o libpnd.a
+ ${C
XX}
-o bin/discotest discotest.o libpnd.a
evdevtest: evdevtest.o ${LIB}
evdevtest: evdevtest.o ${LIB}
- ${C
C} -lstdc++
-o bin/evdevtest evdevtest.o -static libpnd.a
+ ${C
XX}
-o bin/evdevtest evdevtest.o -static libpnd.a
notifytest: notifytest.o ${LIB}
notifytest: notifytest.o ${LIB}
- ${C
C} -lstdc++
-o bin/notifytest notifytest.o libpnd.a
+ ${C
XX}
-o bin/notifytest notifytest.o libpnd.a
locatetest: locatetest.o ${SOLIB1}
locatetest: locatetest.o ${SOLIB1}
- ${C
C} -lstdc++
-o bin/locatetest locatetest.o ${SOLIB1}
+ ${C
XX}
-o bin/locatetest locatetest.o ${SOLIB1}
rawpxmltest: rawpxmltest.o ${LIB}
rawpxmltest: rawpxmltest.o ${LIB}
- ${C
C} -lstdc++
-o bin/rawpxmltest rawpxmltest.o ${LIB}
+ ${C
XX}
-o bin/rawpxmltest rawpxmltest.o ${LIB}
loggertest: loggertest.o ${LIB}
loggertest: loggertest.o ${LIB}
- ${C
C} -lstdc++
-o bin/loggertest loggertest.o libpnd.a
+ ${C
XX}
-o bin/loggertest loggertest.o libpnd.a
dbusnotifytest: dbusnotifytest.o ${LIB}
dbusnotifytest: dbusnotifytest.o ${LIB}
- ${C
C} -lstdc++
-o bin/dbusnotifytest dbusnotifytest.o libpnd.a
+ ${C
XX}
-o bin/dbusnotifytest dbusnotifytest.o libpnd.a
evtest: evtest.o
${CC} -o bin/evtest evtest.o
evtest: evtest.o
${CC} -o bin/evtest evtest.o